Re: [RESEND PATCH v2 2/2] cpufreq: qcom-nvmem: add support for IPQ8064

[Christian Marangi]

On Wed, May 31, 2023 at 10:40:54AM +0200, Konrad Dybcio wrote:
> 
> 
> On 30.05.2023 18:58, Robert Marko wrote:
> > From: Christian Marangi <ansuelsmth@xxxxxxxxx>
> > 
> > IPQ8064 comes in 3 families:
> > * IPQ8062 up to 1.0GHz
> > * IPQ8064/IPQ8066/IPQ8068 up to 1.4GHz
> > * IPQ8065/IPQ8069 up to 1.7Ghz
> > 
> > So, in order to be able to share one OPP table, add support for
> > IPQ8064 family based of SMEM SoC ID-s as speedbin fuse is always 0 on
> > IPQ8064.
> > 
> > Bit are set with the following logic:
> > * IPQ8062 BIT 0
> > * IPQ8064/IPQ8066/IPQ8068 BIT 1
> > * IPQ8065/IPQ8069 BIT 2
> > 
> > speed is never fused, only psv values are fused.
> > Set speed to the versions to permit a unified opp table following
> > this named opp:
> > 
> > opp-microvolt-speed<SPEED_VALUE>-pvs<PSV_VALUE>-v0
> > 
> > Example:
> > - for ipq8062 psv2
> >   opp-microvolt-speed0-pvs2-v0 = < 925000 878750 971250>
> > - for ipq8064 psv2
> >   opp-microvolt-speed2-pvs2-v0 = <925000 878750 971250>;
> > - for ipq8065 psv2
> >   opp-microvolt-speed4-pvs2-v0 = <950000 902500 997500>;
> > 
> > Signed-off-by: Christian Marangi <ansuelsmth@xxxxxxxxx>
> > Signed-off-by: Robert Marko <robimarko@xxxxxxxxx>
> > ---
> >  drivers/cpufreq/qcom-cpufreq-nvmem.c | 73 +++++++++++++++++++++++++++-
> >  1 file changed, 72 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c
> > index ce444b5962f2..c644138680ba 100644
> > --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
> > +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
> > @@ -34,6 +34,10 @@
> >  #define IPQ8074_HAWKEYE_VERSION		BIT(0)
> >  #define IPQ8074_ACORN_VERSION		BIT(1)
> >  
> > +#define IPQ8062_VERSION		BIT(0)
> > +#define IPQ8064_VERSION		BIT(1)
> > +#define IPQ8065_VERSION		BIT(2)
> > +
> >  struct qcom_cpufreq_drv;
> >  
> >  struct qcom_cpufreq_match_data {
> > @@ -207,6 +211,69 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev,
> >  	return ret;
> >  }
> >  
> > +static int qcom_cpufreq_ipq8064_name_version(struct device *cpu_dev,
> > +					     struct nvmem_cell *speedbin_nvmem,
> > +					     char **pvs_name,
> > +					     struct qcom_cpufreq_drv *drv)
> > +{
> > +	int speed = 0, pvs = 0, pvs_ver = 0;
> > +	int msm_id, ret = 0;
> > +	u8 *speedbin;
> > +	size_t len;
> > +
> > +	speedbin = nvmem_cell_read(speedbin_nvmem, &len);
> > +
> > +	if (IS_ERR(speedbin))
> > +		return PTR_ERR(speedbin);
> > +
> > +	switch (len) {
> Do we expect more variety here? Otherwise a switch statement sounds a
> bit too heavy for the job, imo.
>

Well no, considering ipq8064 is effectively EOL i guess format 4 is the
only one present. But if you check the driver this is like a pattern so
the idea was too keep that. I can totally change that to a simple
if (len != 4) if we really want.

> > +	case 4:
> > +		get_krait_bin_format_a(cpu_dev, &speed, &pvs, &pvs_ver,
> > +				       speedbin);
> > +		break;
> > +	default:
> > +		dev_err(cpu_dev, "Unable to read nvmem data. Defaulting to 0!\n");
> > +		ret = -ENODEV;
> > +		goto len_error;
> > +	}
> > +
> > +	ret = qcom_smem_get_soc_id(&msm_id);
> > +	if (ret)
> > +		return ret;
> > +
> > +	switch (msm_id) {
> > +	case QCOM_ID_IPQ8062:
> > +		drv->versions = IPQ8062_VERSION;
> > +		break;
> > +	case QCOM_ID_IPQ8064:
> > +	case QCOM_ID_IPQ8066:
> > +	case QCOM_ID_IPQ8068:
> > +		drv->versions = IPQ8064_VERSION;
> > +		break;
> > +	case QCOM_ID_IPQ8065:
> > +	case QCOM_ID_IPQ8069:
> > +		drv->versions = IPQ8065_VERSION;
> > +		break;
> > +	default:
> > +		dev_err(cpu_dev,
> > +			"SoC ID %u is not part of IPQ8064 family, limiting to 1.0GHz!\n",
> > +			msm_id);
> > +		drv->versions = IPQ8062_VERSION;
> > +		break;
> > +	}
> > +
> > +	/*
> > +	 * IPQ8064 speed is never fused. Only psv values are fused.
> > +	 * Set speed to the versions to permit a unified opp table.
> > +	 */
> > +	snprintf(*pvs_name, sizeof("speedXX-pvsXX-vXX"), "speed%d-pvs%d-v%d",
> > +		 drv->versions, pvs, pvs_ver);
> > +
> > +len_error:
> > +	kfree(speedbin);
> Perhaps we should switch to devres-managed nvmem soon..
> 

devres nvmem would be very good, maybe an idea would be search for the
actualy use of nvmem_cell_read and see if it's worth to introduce these
new API.

> > +	return ret;
> > +}
> > +
> >  static int qcom_cpufreq_ipq8074_name_version(struct device *cpu_dev,
> >  					     struct nvmem_cell *speedbin_nvmem,
> >  					     char **pvs_name,
> > @@ -256,6 +323,10 @@ static const struct qcom_cpufreq_match_data match_data_qcs404 = {
> >  	.genpd_names = qcs404_genpd_names,
> >  };
> >  
> > +static const struct qcom_cpufreq_match_data match_data_ipq8064 = {
> > +	.get_version = qcom_cpufreq_ipq8064_name_version,
> > +};
> > +
> >  static const struct qcom_cpufreq_match_data match_data_ipq8074 = {
> >  	.get_version = qcom_cpufreq_ipq8074_name_version,
> >  };
> > @@ -404,7 +475,7 @@ static const struct of_device_id qcom_cpufreq_match_list[] __initconst = {
> >  	{ .compatible = "qcom,apq8096", .data = &match_data_kryo },
> >  	{ .compatible = "qcom,msm8996", .data = &match_data_kryo },
> >  	{ .compatible = "qcom,qcs404", .data = &match_data_qcs404 },
> > -	{ .compatible = "qcom,ipq8064", .data = &match_data_krait },
> > +	{ .compatible = "qcom,ipq8064", .data = &match_data_ipq8064 },
> >  	{ .compatible = "qcom,ipq8074", .data = &match_data_ipq8074 },
> >  	{ .compatible = "qcom,apq8064", .data = &match_data_krait },
> >  	{ .compatible = "qcom,msm8974", .data = &match_data_krait },

-- 
	Ansuel