| Message ID | 20220221220743.541704-1-caleb.connolly@linaro.org |
|---|---|
| Headers | show |
| Series | iio: adc: introduce Qualcomm SPMI Round Robin ADC | expand |
On Fri, Feb 25, 2022 at 09:23:24AM +0000, Lee Jones wrote: > On Fri, 25 Feb 2022, Dan Carpenter wrote: > > > On Fri, Feb 25, 2022 at 08:50:43AM +0000, Lee Jones wrote: > > > On Thu, 24 Feb 2022, Bjorn Andersson wrote: > > > > > > > On Mon 21 Feb 16:07 CST 2022, Caleb Connolly wrote: > > > > > > > > > Some PMIC functions such as the RRADC need to be aware of the PMIC > > > > > chip revision information to implement errata or otherwise adjust > > > > > behaviour, export the PMIC information to enable this. > > > > > > > > > > This is specifically required to enable the RRADC to adjust > > > > > coefficients based on which chip fab the PMIC was produced in, > > > > > this can vary per unique device and therefore has to be read at > > > > > runtime. > > > > > > > > > > [bugs in previous revision] > > > > > Reported-by: kernel test robot <lkp@intel.com> > > > > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > > > > > > > > This says is that "kernel test robot" and Dan reported that something > > > > needed to be fixed and this patch is the fix for this. > > > > > > > > So even though their emails asks for you to give them credit like this > > > > you can't do it for new patches. > > > > > > Right, or else you'd have to give credit to anyone who provided you > > > with a review. This could potentially grow to quite a long list. > > > > > > > I always feel like people who find crashing bugs should get credit but > > no credit for complaining about style. It's like we reward people for > > reporting bugs after it gets merged but not before. > > > > We've had this debate before and people don't agree with me or they say > > that it's fine to just include the Reported-by kbuild tags and let > > people figure out from the context that probably kbuild didn't tell > > people to write a new driver. > > Reviews will often consist of both style and logic recommendations. > If not spotted and remedied, the latter of which would likely result > in undesired behaviour a.k.a. bugs. So at what point, or what type of > bug would warrant a tag? > If it's a crash or memory leak. Style comments and fixing typos are their own reward. Basically it's the same rule as Fixes tags. We shouldn't use Fixes tags for typos. regards, dan carpenter
On Fri 25 Feb 01:04 PST 2022, Dan Carpenter wrote: > On Fri, Feb 25, 2022 at 08:50:43AM +0000, Lee Jones wrote: > > On Thu, 24 Feb 2022, Bjorn Andersson wrote: > > > > > On Mon 21 Feb 16:07 CST 2022, Caleb Connolly wrote: > > > > > > > Some PMIC functions such as the RRADC need to be aware of the PMIC > > > > chip revision information to implement errata or otherwise adjust > > > > behaviour, export the PMIC information to enable this. > > > > > > > > This is specifically required to enable the RRADC to adjust > > > > coefficients based on which chip fab the PMIC was produced in, > > > > this can vary per unique device and therefore has to be read at > > > > runtime. > > > > > > > > [bugs in previous revision] > > > > Reported-by: kernel test robot <lkp@intel.com> > > > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > > > > > > This says is that "kernel test robot" and Dan reported that something > > > needed to be fixed and this patch is the fix for this. > > > > > > So even though their emails asks for you to give them credit like this > > > you can't do it for new patches. > > > > Right, or else you'd have to give credit to anyone who provided you > > with a review. This could potentially grow to quite a long list. > > > > I always feel like people who find crashing bugs should get credit but > no credit for complaining about style. It's like we reward people for > reporting bugs after it gets merged but not before. > > We've had this debate before and people don't agree with me or they say > that it's fine to just include the Reported-by kbuild tags and let > people figure out from the context that probably kbuild didn't tell > people to write a new driver. > I certainly would like to be able to recognize any form of review effort going into the evolution of a patch, but if we use Reported-by for that purpose we're loosing the ability to credit the effort to find the regressions in the kernel. And while it's clear that Reported-by could mean that you spotted a bug in a previous revision of the patch, should this then be used to denote anyone that came with any sort of feedback? Do we want to "repurpose" Reported-by to be a list of anyone providing any input to any previous revision of the patches? (Reported-by doesn't sound like the right tag for that to me) > Also I think that counting Reviewed-by/Acked-by tags should be > discouraged. It's useful as a communication between maintainers but it > shouldn't be rewarded. > For acked-by I definitely agree. At least in my subsystems I see a quite good flow of Reviewed-bys from community members and am very happy about that. It communicates that people approves of the patch, in contrast to the more common case of no one dissaproving the patch and it's merged just with my S-o-b... Regards, Bjorn
On Mon, 21 Feb 2022 22:07:35 +0000 Caleb Connolly <caleb.connolly@linaro.org> wrote: > The helper function spmi_device_from_of() takes a device node and > returns the SPMI device associated with it. > This is like of_find_device_by_node but for SPMI devices. > > Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> Hi I'm assuming this series will end up going in through my IIO tree. So with that in mind, looking for an Ack from Stephen for this one. One comment below. Also, I vaguely wondered about whether this should switch to generic struct fwnode rather than of/dt specific but that's probably a question for Stephen. Thanks, Jonathan > --- > drivers/spmi/spmi.c | 17 +++++++++++++++++ > include/linux/spmi.h | 2 ++ > 2 files changed, 19 insertions(+) > > diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c > index b37ead9e2fad..de550b777451 100644 > --- a/drivers/spmi/spmi.c > +++ b/drivers/spmi/spmi.c > @@ -386,6 +386,23 @@ static struct bus_type spmi_bus_type = { > .uevent = spmi_drv_uevent, > }; > > +/** > + * spmi_device_from_of() - get the associated SPMI device from a device node > + * > + * @np: device node > + * > + * Returns the struct spmi_device associated with a device node or NULL. > + */ > +inline struct spmi_device *spmi_device_from_of(struct device_node *np) Drop the inline. You are exporting it which would make inline rather hard to do and in general inline markings should be used only where there is a clear performance argument and there isn't one here. > +{ > + struct device *dev = bus_find_device_by_of_node(&spmi_bus_type, np); > + > + if (dev) > + return to_spmi_device(dev); > + return NULL; > +} > +EXPORT_SYMBOL_GPL(spmi_device_from_of); > + > /** > * spmi_controller_alloc() - Allocate a new SPMI device > * @ctrl: associated controller > diff --git a/include/linux/spmi.h b/include/linux/spmi.h > index 729bcbf9f5ad..6ee476bc1cd6 100644 > --- a/include/linux/spmi.h > +++ b/include/linux/spmi.h > @@ -7,6 +7,7 @@ > #include <linux/types.h> > #include <linux/device.h> > #include <linux/mod_devicetable.h> > +#include <linux/of.h> > > /* Maximum slave identifier */ > #define SPMI_MAX_SLAVE_ID 16 > @@ -164,6 +165,7 @@ static inline void spmi_driver_unregister(struct spmi_driver *sdrv) > module_driver(__spmi_driver, spmi_driver_register, \ > spmi_driver_unregister) > > +inline struct spmi_device *spmi_device_from_of(struct device_node *np); > int spmi_register_read(struct spmi_device *sdev, u8 addr, u8 *buf); > int spmi_ext_register_read(struct spmi_device *sdev, u8 addr, u8 *buf, > size_t len);
On Mon, 21 Feb 2022 22:07:36 +0000 Caleb Connolly <caleb.connolly@linaro.org> wrote: > Some PMIC functions such as the RRADC need to be aware of the PMIC > chip revision information to implement errata or otherwise adjust > behaviour, export the PMIC information to enable this. > > This is specifically required to enable the RRADC to adjust > coefficients based on which chip fab the PMIC was produced in, > this can vary per unique device and therefore has to be read at > runtime. > > [bugs in previous revision] > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> Hi Caleb, One trivial question about a comment below. Otherwise, looking for mfd ack from Lee. Is anyone actively maintaining mfd/qcom-spmi-pmic.c? If some one at least familiar with that code (Bjorn or Stephen maybe?) could take a quick look that would also be great. Thanks, Jonathan > --- > drivers/mfd/qcom-spmi-pmic.c | 174 ++++++++++++++++++++---------- > include/soc/qcom/qcom-spmi-pmic.h | 60 +++++++++++ > 2 files changed, 178 insertions(+), 56 deletions(-) > create mode 100644 include/soc/qcom/qcom-spmi-pmic.h > > diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c > index 1cacc00aa6c9..1ef426a1513b 100644 > --- a/drivers/mfd/qcom-spmi-pmic.c > +++ b/drivers/mfd/qcom-spmi-pmic.c > @@ -3,11 +3,16 @@ > * Copyright (c) 2014, The Linux Foundation. All rights reserved. > */ > > +#include <linux/device.h> > +#include <linux/errno.h> > +#include <linux/gfp.h> > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/spmi.h> > +#include <linux/types.h> > #include <linux/regmap.h> > #include <linux/of_platform.h> > +#include <soc/qcom/qcom-spmi-pmic.h> > > #define PMIC_REV2 0x101 > #define PMIC_REV3 0x102 > @@ -17,37 +22,6 @@ > > #define PMIC_TYPE_VALUE 0x51 > > -#define COMMON_SUBTYPE 0x00 > -#define PM8941_SUBTYPE 0x01 > -#define PM8841_SUBTYPE 0x02 > -#define PM8019_SUBTYPE 0x03 > -#define PM8226_SUBTYPE 0x04 > -#define PM8110_SUBTYPE 0x05 > -#define PMA8084_SUBTYPE 0x06 > -#define PMI8962_SUBTYPE 0x07 > -#define PMD9635_SUBTYPE 0x08 > -#define PM8994_SUBTYPE 0x09 > -#define PMI8994_SUBTYPE 0x0a > -#define PM8916_SUBTYPE 0x0b > -#define PM8004_SUBTYPE 0x0c > -#define PM8909_SUBTYPE 0x0d > -#define PM8028_SUBTYPE 0x0e > -#define PM8901_SUBTYPE 0x0f > -#define PM8950_SUBTYPE 0x10 > -#define PMI8950_SUBTYPE 0x11 > -#define PM8998_SUBTYPE 0x14 > -#define PMI8998_SUBTYPE 0x15 > -#define PM8005_SUBTYPE 0x18 > -#define PM660L_SUBTYPE 0x1A > -#define PM660_SUBTYPE 0x1B > -#define PM8150_SUBTYPE 0x1E > -#define PM8150L_SUBTYPE 0x1f > -#define PM8150B_SUBTYPE 0x20 > -#define PMK8002_SUBTYPE 0x21 > -#define PM8009_SUBTYPE 0x24 > -#define PM8150C_SUBTYPE 0x26 > -#define SMB2351_SUBTYPE 0x29 > - > static const struct of_device_id pmic_spmi_id_table[] = { > { .compatible = "qcom,pm660", .data = (void *)PM660_SUBTYPE }, > { .compatible = "qcom,pm660l", .data = (void *)PM660L_SUBTYPE }, > @@ -81,42 +55,118 @@ static const struct of_device_id pmic_spmi_id_table[] = { > { } > }; > > -static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) > +/** > + * qcom_pmic_get() - Get a pointer to the base PMIC device > + * > + * @dev: the pmic function device > + * @return: the struct qcom_spmi_pmic* pointer associated with the function device > + * > + * A PMIC can be represented by multiple SPMI devices, but > + * only the base PMIC device will contain a reference to > + * the revision information. > + * > + * This function takes a pointer to a function device and > + * returns a pointer to the base PMIC device. > + */ > +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev) > +{ > + struct spmi_device *sdev; > + struct device_node *spmi_bus; > + struct device_node *other_usid = NULL; > + int function_parent_usid, ret; > + u32 reg[2]; > + > + if (!of_match_device(pmic_spmi_id_table, dev->parent)) > + return ERR_PTR(-EINVAL); > + > + sdev = to_spmi_device(dev->parent); > + if (!sdev) > + return ERR_PTR(-EINVAL); > + > + /* > + * Quick return if the function device is already in the right > + * USID > + */ > + if (sdev->usid % 2 == 0) > + return spmi_device_get_drvdata(sdev); > + > + function_parent_usid = sdev->usid; > + > + /* > + * Walk through the list of PMICs until we find the sibling USID. > + * The goal is the find to previous sibling. Assuming there is no Probably: The goal is to find the previous sibling. ? > + * PMIC with more than 2 USIDs. We know that function_parent_usid > + * is one greater than the base USID. > + */ > + spmi_bus = of_get_parent(sdev->dev.parent->of_node); > + do { > + other_usid = of_get_next_child(spmi_bus, other_usid); > + ret = of_property_read_u32_array(other_usid, "reg", reg, 2); > + if (ret) > + return ERR_PTR(ret); > + sdev = spmi_device_from_of(other_usid); > + if (sdev == NULL) { > + /* > + * If the base USID for this PMIC hasn't probed yet > + * but the secondary USID has, then we need to defer > + * the function driver so that it will attempt to > + * probe again when the base USID is ready. > + */ > + if (reg[0] == function_parent_usid - 1) > + return ERR_PTR(-EPROBE_DEFER); > + > + continue; > + } > + > + if (reg[0] == function_parent_usid - 1) > + return spmi_device_get_drvdata(sdev); > + } while (other_usid->sibling); > + > + return ERR_PTR(-ENODATA); > +} > +EXPORT_SYMBOL(qcom_pmic_get); > + > +static inline void pmic_print_info(struct device *dev, struct qcom_spmi_pmic *pmic) > +{ > + dev_dbg(dev, "%x: %s v%d.%d\n", > + pmic->subtype, pmic->name, pmic->major, pmic->minor); > +} > + > +static int pmic_spmi_load_revid(struct regmap *map, struct device *dev, > + struct qcom_spmi_pmic *pmic) > { > - unsigned int rev2, minor, major, type, subtype; > - const char *name = "unknown"; > int ret, i; > > - ret = regmap_read(map, PMIC_TYPE, &type); > + ret = regmap_read(map, PMIC_TYPE, &pmic->type); > if (ret < 0) > - return; > + return ret; > > - if (type != PMIC_TYPE_VALUE) > - return; > + if (pmic->type != PMIC_TYPE_VALUE) > + return ret; > > - ret = regmap_read(map, PMIC_SUBTYPE, &subtype); > + ret = regmap_read(map, PMIC_SUBTYPE, &pmic->subtype); > if (ret < 0) > - return; > + return ret; > > for (i = 0; i < ARRAY_SIZE(pmic_spmi_id_table); i++) { > - if (subtype == (unsigned long)pmic_spmi_id_table[i].data) > + if (pmic->subtype == (unsigned long)pmic_spmi_id_table[i].data) > break; > } > > if (i != ARRAY_SIZE(pmic_spmi_id_table)) > - name = pmic_spmi_id_table[i].compatible; > + pmic->name = devm_kstrdup_const(dev, pmic_spmi_id_table[i].compatible, GFP_KERNEL); > > - ret = regmap_read(map, PMIC_REV2, &rev2); > + ret = regmap_read(map, PMIC_REV2, &pmic->rev2); > if (ret < 0) > - return; > + return ret; > > - ret = regmap_read(map, PMIC_REV3, &minor); > + ret = regmap_read(map, PMIC_REV3, &pmic->minor); > if (ret < 0) > - return; > + return ret; > > - ret = regmap_read(map, PMIC_REV4, &major); > + ret = regmap_read(map, PMIC_REV4, &pmic->major); > if (ret < 0) > - return; > + return ret; > > /* > * In early versions of PM8941 and PM8226, the major revision number > @@ -124,14 +174,16 @@ static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) > * Increment the major revision number here if the chip is an early > * version of PM8941 or PM8226. > */ > - if ((subtype == PM8941_SUBTYPE || subtype == PM8226_SUBTYPE) && > - major < 0x02) > - major++; > + if ((pmic->subtype == PM8941_SUBTYPE || pmic->subtype == PM8226_SUBTYPE) && > + pmic->major < 0x02) > + pmic->major++; > + > + if (pmic->subtype == PM8110_SUBTYPE) > + pmic->minor = pmic->rev2; > > - if (subtype == PM8110_SUBTYPE) > - minor = rev2; > + pmic_print_info(dev, pmic); > > - dev_dbg(dev, "%x: %s v%d.%d\n", subtype, name, major, minor); > + return 0; > } > > static const struct regmap_config spmi_regmap_config = { > @@ -144,14 +196,24 @@ static const struct regmap_config spmi_regmap_config = { > static int pmic_spmi_probe(struct spmi_device *sdev) > { > struct regmap *regmap; > + struct qcom_spmi_pmic *pmic; > + int ret; > > regmap = devm_regmap_init_spmi_ext(sdev, &spmi_regmap_config); > if (IS_ERR(regmap)) > return PTR_ERR(regmap); > > + pmic = devm_kzalloc(&sdev->dev, sizeof(*pmic), GFP_KERNEL); > + if (!pmic) > + return -ENOMEM; > + > /* Only the first slave id for a PMIC contains this information */ > - if (sdev->usid % 2 == 0) > - pmic_spmi_show_revid(regmap, &sdev->dev); > + if (sdev->usid % 2 == 0) { > + ret = pmic_spmi_load_revid(regmap, &sdev->dev, pmic); > + if (ret < 0) > + return ret; > + spmi_device_set_drvdata(sdev, pmic); > + } > > return devm_of_platform_populate(&sdev->dev); > } > diff --git a/include/soc/qcom/qcom-spmi-pmic.h b/include/soc/qcom/qcom-spmi-pmic.h > new file mode 100644 > index 000000000000..a8a77be22cfc > --- /dev/null > +++ b/include/soc/qcom/qcom-spmi-pmic.h > @@ -0,0 +1,60 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* Copyright (c) 2021 Linaro. All rights reserved. > + * Copyright (c) 2021 Caleb Connolly <caleb.connolly@linaro.org> > + */ > + > +#ifndef __QCOM_PMIC_H__ > +#define __QCOM_PMIC_H__ > + > +#define COMMON_SUBTYPE 0x00 > +#define PM8941_SUBTYPE 0x01 > +#define PM8841_SUBTYPE 0x02 > +#define PM8019_SUBTYPE 0x03 > +#define PM8226_SUBTYPE 0x04 > +#define PM8110_SUBTYPE 0x05 > +#define PMA8084_SUBTYPE 0x06 > +#define PMI8962_SUBTYPE 0x07 > +#define PMD9635_SUBTYPE 0x08 > +#define PM8994_SUBTYPE 0x09 > +#define PMI8994_SUBTYPE 0x0a > +#define PM8916_SUBTYPE 0x0b > +#define PM8004_SUBTYPE 0x0c > +#define PM8909_SUBTYPE 0x0d > +#define PM8028_SUBTYPE 0x0e > +#define PM8901_SUBTYPE 0x0f > +#define PM8950_SUBTYPE 0x10 > +#define PMI8950_SUBTYPE 0x11 > +#define PM8998_SUBTYPE 0x14 > +#define PMI8998_SUBTYPE 0x15 > +#define PM8005_SUBTYPE 0x18 > +#define PM660L_SUBTYPE 0x1A > +#define PM660_SUBTYPE 0x1B > +#define PM8150_SUBTYPE 0x1E > +#define PM8150L_SUBTYPE 0x1f > +#define PM8150B_SUBTYPE 0x20 > +#define PMK8002_SUBTYPE 0x21 > +#define PM8009_SUBTYPE 0x24 > +#define PM8150C_SUBTYPE 0x26 > +#define SMB2351_SUBTYPE 0x29 > + > +#define PMI8998_FAB_ID_SMIC 0x11 > +#define PMI8998_FAB_ID_GF 0x30 > + > +#define PM660_FAB_ID_GF 0x0 > +#define PM660_FAB_ID_TSMC 0x2 > +#define PM660_FAB_ID_MX 0x3 > + > +struct qcom_spmi_pmic { > + unsigned int type; > + unsigned int subtype; > + unsigned int major; > + unsigned int minor; > + unsigned int rev2; > + const char *name; > +}; > + > +struct device; > + > +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev); > + > +#endif /* __QCOM_PMIC_H__ */
On Tue, 22 Feb 2022 at 01:08, Caleb Connolly <caleb.connolly@linaro.org> wrote: > > Some PMIC functions such as the RRADC need to be aware of the PMIC > chip revision information to implement errata or otherwise adjust > behaviour, export the PMIC information to enable this. > > This is specifically required to enable the RRADC to adjust > coefficients based on which chip fab the PMIC was produced in, > this can vary per unique device and therefore has to be read at > runtime. > > [bugs in previous revision] > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> > --- > drivers/mfd/qcom-spmi-pmic.c | 174 ++++++++++++++++++++---------- > include/soc/qcom/qcom-spmi-pmic.h | 60 +++++++++++ > 2 files changed, 178 insertions(+), 56 deletions(-) > create mode 100644 include/soc/qcom/qcom-spmi-pmic.h > > diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c > index 1cacc00aa6c9..1ef426a1513b 100644 > --- a/drivers/mfd/qcom-spmi-pmic.c > +++ b/drivers/mfd/qcom-spmi-pmic.c > @@ -3,11 +3,16 @@ > * Copyright (c) 2014, The Linux Foundation. All rights reserved. > */ > > +#include <linux/device.h> > +#include <linux/errno.h> > +#include <linux/gfp.h> > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/spmi.h> > +#include <linux/types.h> > #include <linux/regmap.h> > #include <linux/of_platform.h> > +#include <soc/qcom/qcom-spmi-pmic.h> > > #define PMIC_REV2 0x101 > #define PMIC_REV3 0x102 > @@ -17,37 +22,6 @@ > > #define PMIC_TYPE_VALUE 0x51 > > -#define COMMON_SUBTYPE 0x00 > -#define PM8941_SUBTYPE 0x01 > -#define PM8841_SUBTYPE 0x02 > -#define PM8019_SUBTYPE 0x03 > -#define PM8226_SUBTYPE 0x04 > -#define PM8110_SUBTYPE 0x05 > -#define PMA8084_SUBTYPE 0x06 > -#define PMI8962_SUBTYPE 0x07 > -#define PMD9635_SUBTYPE 0x08 > -#define PM8994_SUBTYPE 0x09 > -#define PMI8994_SUBTYPE 0x0a > -#define PM8916_SUBTYPE 0x0b > -#define PM8004_SUBTYPE 0x0c > -#define PM8909_SUBTYPE 0x0d > -#define PM8028_SUBTYPE 0x0e > -#define PM8901_SUBTYPE 0x0f > -#define PM8950_SUBTYPE 0x10 > -#define PMI8950_SUBTYPE 0x11 > -#define PM8998_SUBTYPE 0x14 > -#define PMI8998_SUBTYPE 0x15 > -#define PM8005_SUBTYPE 0x18 > -#define PM660L_SUBTYPE 0x1A > -#define PM660_SUBTYPE 0x1B > -#define PM8150_SUBTYPE 0x1E > -#define PM8150L_SUBTYPE 0x1f > -#define PM8150B_SUBTYPE 0x20 > -#define PMK8002_SUBTYPE 0x21 > -#define PM8009_SUBTYPE 0x24 > -#define PM8150C_SUBTYPE 0x26 > -#define SMB2351_SUBTYPE 0x29 > - > static const struct of_device_id pmic_spmi_id_table[] = { > { .compatible = "qcom,pm660", .data = (void *)PM660_SUBTYPE }, > { .compatible = "qcom,pm660l", .data = (void *)PM660L_SUBTYPE }, > @@ -81,42 +55,118 @@ static const struct of_device_id pmic_spmi_id_table[] = { > { } > }; > > -static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) > +/** > + * qcom_pmic_get() - Get a pointer to the base PMIC device > + * > + * @dev: the pmic function device > + * @return: the struct qcom_spmi_pmic* pointer associated with the function device > + * > + * A PMIC can be represented by multiple SPMI devices, but > + * only the base PMIC device will contain a reference to > + * the revision information. > + * > + * This function takes a pointer to a function device and > + * returns a pointer to the base PMIC device. > + */ > +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev) > +{ > + struct spmi_device *sdev; > + struct device_node *spmi_bus; > + struct device_node *other_usid = NULL; > + int function_parent_usid, ret; > + u32 reg[2]; > + > + if (!of_match_device(pmic_spmi_id_table, dev->parent)) > + return ERR_PTR(-EINVAL); > + > + sdev = to_spmi_device(dev->parent); > + if (!sdev) > + return ERR_PTR(-EINVAL); > + > + /* > + * Quick return if the function device is already in the right > + * USID > + */ > + if (sdev->usid % 2 == 0) > + return spmi_device_get_drvdata(sdev); > + > + function_parent_usid = sdev->usid; > + > + /* > + * Walk through the list of PMICs until we find the sibling USID. > + * The goal is the find to previous sibling. Assuming there is no > + * PMIC with more than 2 USIDs. We know that function_parent_usid > + * is one greater than the base USID. > + */ I think this is not correct for newer platforms. On SM8450 we have PMICs which do not share a pair of USIDs. For example on sm8450-qrd: PMK8350 @ 0 PM8350 @ 1 PM8350C @ 2 PM8350B @ 3 PMR735A @ 4 PMR735B @ 5 PM8450 @ 7 > + spmi_bus = of_get_parent(sdev->dev.parent->of_node); > + do { > + other_usid = of_get_next_child(spmi_bus, other_usid); > + ret = of_property_read_u32_array(other_usid, "reg", reg, 2); > + if (ret) > + return ERR_PTR(ret); > + sdev = spmi_device_from_of(other_usid); > + if (sdev == NULL) { > + /* > + * If the base USID for this PMIC hasn't probed yet > + * but the secondary USID has, then we need to defer > + * the function driver so that it will attempt to > + * probe again when the base USID is ready. > + */ > + if (reg[0] == function_parent_usid - 1) > + return ERR_PTR(-EPROBE_DEFER); > + > + continue; > + } > + > + if (reg[0] == function_parent_usid - 1) > + return spmi_device_get_drvdata(sdev); > + } while (other_usid->sibling); > + > + return ERR_PTR(-ENODATA); > +} > +EXPORT_SYMBOL(qcom_pmic_get); > + > +static inline void pmic_print_info(struct device *dev, struct qcom_spmi_pmic *pmic) > +{ > + dev_dbg(dev, "%x: %s v%d.%d\n", > + pmic->subtype, pmic->name, pmic->major, pmic->minor); > +} > + > +static int pmic_spmi_load_revid(struct regmap *map, struct device *dev, > + struct qcom_spmi_pmic *pmic) > { > - unsigned int rev2, minor, major, type, subtype; > - const char *name = "unknown"; > int ret, i; > > - ret = regmap_read(map, PMIC_TYPE, &type); > + ret = regmap_read(map, PMIC_TYPE, &pmic->type); > if (ret < 0) > - return; > + return ret; > > - if (type != PMIC_TYPE_VALUE) > - return; > + if (pmic->type != PMIC_TYPE_VALUE) > + return ret; > > - ret = regmap_read(map, PMIC_SUBTYPE, &subtype); > + ret = regmap_read(map, PMIC_SUBTYPE, &pmic->subtype); > if (ret < 0) > - return; > + return ret; > > for (i = 0; i < ARRAY_SIZE(pmic_spmi_id_table); i++) { > - if (subtype == (unsigned long)pmic_spmi_id_table[i].data) > + if (pmic->subtype == (unsigned long)pmic_spmi_id_table[i].data) > break; > } > > if (i != ARRAY_SIZE(pmic_spmi_id_table)) > - name = pmic_spmi_id_table[i].compatible; > + pmic->name = devm_kstrdup_const(dev, pmic_spmi_id_table[i].compatible, GFP_KERNEL); > > - ret = regmap_read(map, PMIC_REV2, &rev2); > + ret = regmap_read(map, PMIC_REV2, &pmic->rev2); > if (ret < 0) > - return; > + return ret; > > - ret = regmap_read(map, PMIC_REV3, &minor); > + ret = regmap_read(map, PMIC_REV3, &pmic->minor); > if (ret < 0) > - return; > + return ret; > > - ret = regmap_read(map, PMIC_REV4, &major); > + ret = regmap_read(map, PMIC_REV4, &pmic->major); > if (ret < 0) > - return; > + return ret; > > /* > * In early versions of PM8941 and PM8226, the major revision number > @@ -124,14 +174,16 @@ static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) > * Increment the major revision number here if the chip is an early > * version of PM8941 or PM8226. > */ > - if ((subtype == PM8941_SUBTYPE || subtype == PM8226_SUBTYPE) && > - major < 0x02) > - major++; > + if ((pmic->subtype == PM8941_SUBTYPE || pmic->subtype == PM8226_SUBTYPE) && > + pmic->major < 0x02) > + pmic->major++; > + > + if (pmic->subtype == PM8110_SUBTYPE) > + pmic->minor = pmic->rev2; > > - if (subtype == PM8110_SUBTYPE) > - minor = rev2; > + pmic_print_info(dev, pmic); > > - dev_dbg(dev, "%x: %s v%d.%d\n", subtype, name, major, minor); > + return 0; > } > > static const struct regmap_config spmi_regmap_config = { > @@ -144,14 +196,24 @@ static const struct regmap_config spmi_regmap_config = { > static int pmic_spmi_probe(struct spmi_device *sdev) > { > struct regmap *regmap; > + struct qcom_spmi_pmic *pmic; > + int ret; > > regmap = devm_regmap_init_spmi_ext(sdev, &spmi_regmap_config); > if (IS_ERR(regmap)) > return PTR_ERR(regmap); > > + pmic = devm_kzalloc(&sdev->dev, sizeof(*pmic), GFP_KERNEL); > + if (!pmic) > + return -ENOMEM; > + > /* Only the first slave id for a PMIC contains this information */ > - if (sdev->usid % 2 == 0) > - pmic_spmi_show_revid(regmap, &sdev->dev); > + if (sdev->usid % 2 == 0) { > + ret = pmic_spmi_load_revid(regmap, &sdev->dev, pmic); > + if (ret < 0) > + return ret; > + spmi_device_set_drvdata(sdev, pmic); > + } > > return devm_of_platform_populate(&sdev->dev); > } > diff --git a/include/soc/qcom/qcom-spmi-pmic.h b/include/soc/qcom/qcom-spmi-pmic.h > new file mode 100644 > index 000000000000..a8a77be22cfc > --- /dev/null > +++ b/include/soc/qcom/qcom-spmi-pmic.h > @@ -0,0 +1,60 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* Copyright (c) 2021 Linaro. All rights reserved. > + * Copyright (c) 2021 Caleb Connolly <caleb.connolly@linaro.org> > + */ > + > +#ifndef __QCOM_PMIC_H__ > +#define __QCOM_PMIC_H__ > + > +#define COMMON_SUBTYPE 0x00 > +#define PM8941_SUBTYPE 0x01 > +#define PM8841_SUBTYPE 0x02 > +#define PM8019_SUBTYPE 0x03 > +#define PM8226_SUBTYPE 0x04 > +#define PM8110_SUBTYPE 0x05 > +#define PMA8084_SUBTYPE 0x06 > +#define PMI8962_SUBTYPE 0x07 > +#define PMD9635_SUBTYPE 0x08 > +#define PM8994_SUBTYPE 0x09 > +#define PMI8994_SUBTYPE 0x0a > +#define PM8916_SUBTYPE 0x0b > +#define PM8004_SUBTYPE 0x0c > +#define PM8909_SUBTYPE 0x0d > +#define PM8028_SUBTYPE 0x0e > +#define PM8901_SUBTYPE 0x0f > +#define PM8950_SUBTYPE 0x10 > +#define PMI8950_SUBTYPE 0x11 > +#define PM8998_SUBTYPE 0x14 > +#define PMI8998_SUBTYPE 0x15 > +#define PM8005_SUBTYPE 0x18 > +#define PM660L_SUBTYPE 0x1A > +#define PM660_SUBTYPE 0x1B > +#define PM8150_SUBTYPE 0x1E > +#define PM8150L_SUBTYPE 0x1f > +#define PM8150B_SUBTYPE 0x20 > +#define PMK8002_SUBTYPE 0x21 > +#define PM8009_SUBTYPE 0x24 > +#define PM8150C_SUBTYPE 0x26 > +#define SMB2351_SUBTYPE 0x29 > + > +#define PMI8998_FAB_ID_SMIC 0x11 > +#define PMI8998_FAB_ID_GF 0x30 > + > +#define PM660_FAB_ID_GF 0x0 > +#define PM660_FAB_ID_TSMC 0x2 > +#define PM660_FAB_ID_MX 0x3 > + > +struct qcom_spmi_pmic { > + unsigned int type; > + unsigned int subtype; > + unsigned int major; > + unsigned int minor; > + unsigned int rev2; > + const char *name; > +}; > + > +struct device; > + > +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev); > + > +#endif /* __QCOM_PMIC_H__ */ > -- > 2.35.1 >
On 26/02/2022 18:09, Dmitry Baryshkov wrote: > On Tue, 22 Feb 2022 at 01:08, Caleb Connolly <caleb.connolly@linaro.org> wrote: >> >> Some PMIC functions such as the RRADC need to be aware of the PMIC >> chip revision information to implement errata or otherwise adjust >> behaviour, export the PMIC information to enable this. >> >> This is specifically required to enable the RRADC to adjust >> coefficients based on which chip fab the PMIC was produced in, >> this can vary per unique device and therefore has to be read at >> runtime. >> >> [bugs in previous revision] >> Reported-by: kernel test robot <lkp@intel.com> >> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> >> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> >> --- >> drivers/mfd/qcom-spmi-pmic.c | 174 ++++++++++++++++++++---------- >> include/soc/qcom/qcom-spmi-pmic.h | 60 +++++++++++ >> 2 files changed, 178 insertions(+), 56 deletions(-) >> create mode 100644 include/soc/qcom/qcom-spmi-pmic.h >> >> diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c >> index 1cacc00aa6c9..1ef426a1513b 100644 >> --- a/drivers/mfd/qcom-spmi-pmic.c >> +++ b/drivers/mfd/qcom-spmi-pmic.c >> @@ -3,11 +3,16 @@ >> * Copyright (c) 2014, The Linux Foundation. All rights reserved. >> */ >> >> +#include <linux/device.h> >> +#include <linux/errno.h> >> +#include <linux/gfp.h> >> #include <linux/kernel.h> >> #include <linux/module.h> >> #include <linux/spmi.h> >> +#include <linux/types.h> >> #include <linux/regmap.h> >> #include <linux/of_platform.h> >> +#include <soc/qcom/qcom-spmi-pmic.h> >> >> #define PMIC_REV2 0x101 >> #define PMIC_REV3 0x102 >> @@ -17,37 +22,6 @@ >> >> #define PMIC_TYPE_VALUE 0x51 >> >> -#define COMMON_SUBTYPE 0x00 >> -#define PM8941_SUBTYPE 0x01 >> -#define PM8841_SUBTYPE 0x02 >> -#define PM8019_SUBTYPE 0x03 >> -#define PM8226_SUBTYPE 0x04 >> -#define PM8110_SUBTYPE 0x05 >> -#define PMA8084_SUBTYPE 0x06 >> -#define PMI8962_SUBTYPE 0x07 >> -#define PMD9635_SUBTYPE 0x08 >> -#define PM8994_SUBTYPE 0x09 >> -#define PMI8994_SUBTYPE 0x0a >> -#define PM8916_SUBTYPE 0x0b >> -#define PM8004_SUBTYPE 0x0c >> -#define PM8909_SUBTYPE 0x0d >> -#define PM8028_SUBTYPE 0x0e >> -#define PM8901_SUBTYPE 0x0f >> -#define PM8950_SUBTYPE 0x10 >> -#define PMI8950_SUBTYPE 0x11 >> -#define PM8998_SUBTYPE 0x14 >> -#define PMI8998_SUBTYPE 0x15 >> -#define PM8005_SUBTYPE 0x18 >> -#define PM660L_SUBTYPE 0x1A >> -#define PM660_SUBTYPE 0x1B >> -#define PM8150_SUBTYPE 0x1E >> -#define PM8150L_SUBTYPE 0x1f >> -#define PM8150B_SUBTYPE 0x20 >> -#define PMK8002_SUBTYPE 0x21 >> -#define PM8009_SUBTYPE 0x24 >> -#define PM8150C_SUBTYPE 0x26 >> -#define SMB2351_SUBTYPE 0x29 >> - >> static const struct of_device_id pmic_spmi_id_table[] = { >> { .compatible = "qcom,pm660", .data = (void *)PM660_SUBTYPE }, >> { .compatible = "qcom,pm660l", .data = (void *)PM660L_SUBTYPE }, >> @@ -81,42 +55,118 @@ static const struct of_device_id pmic_spmi_id_table[] = { >> { } >> }; >> >> -static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) >> +/** >> + * qcom_pmic_get() - Get a pointer to the base PMIC device >> + * >> + * @dev: the pmic function device >> + * @return: the struct qcom_spmi_pmic* pointer associated with the function device >> + * >> + * A PMIC can be represented by multiple SPMI devices, but >> + * only the base PMIC device will contain a reference to >> + * the revision information. >> + * >> + * This function takes a pointer to a function device and >> + * returns a pointer to the base PMIC device. >> + */ >> +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev) >> +{ >> + struct spmi_device *sdev; >> + struct device_node *spmi_bus; >> + struct device_node *other_usid = NULL; >> + int function_parent_usid, ret; >> + u32 reg[2]; >> + >> + if (!of_match_device(pmic_spmi_id_table, dev->parent)) >> + return ERR_PTR(-EINVAL); >> + >> + sdev = to_spmi_device(dev->parent); >> + if (!sdev) >> + return ERR_PTR(-EINVAL); >> + >> + /* >> + * Quick return if the function device is already in the right >> + * USID >> + */ >> + if (sdev->usid % 2 == 0) >> + return spmi_device_get_drvdata(sdev); > >> + >> + function_parent_usid = sdev->usid; >> + >> + /* >> + * Walk through the list of PMICs until we find the sibling USID. >> + * The goal is the find to previous sibling. Assuming there is no >> + * PMIC with more than 2 USIDs. We know that function_parent_usid >> + * is one greater than the base USID. >> + */ > Hi Dmitry, > I think this is not correct for newer platforms. On SM8450 we have > PMICs which do not share a pair of USIDs. > For example on sm8450-qrd: > > PMK8350 @ 0 > PM8350 @ 1 > PM8350C @ 2 > PM8350B @ 3 > PMR735A @ 4 > PMR735B @ 5 > PM8450 @ 7 Huh alright, I see a few ways we can deal with this, as if this is the case then I think the existing logic in probe (which only prints the PMIC information) would need to be fixed either way. Could you clarify if these PMICs have only one USID, or if for example PM8350[ABC] is a PMIC with 4 USIDs? None of these PMICs seem to be referenced in the PMIC match table, they aren't in mainline yet? If I rework the logic to use shared compatible strings to find the base PMIC (by finding the matching USID with the smallest address) maybe that would be an acceptable solution, although that would break if a device has more than one of a single pmic... Perhaps for now we could limit the logic to only run for pm(i)8998 and pm660 and return `-EINVAL` with a WARN for other PMICs, as these two are the only ones with drivers that would use this functionality for now, and it can be fixed up for newer PMICs in the future if needed. Let me know what you think.> >> + spmi_bus = of_get_parent(sdev->dev.parent->of_node); >> + do { >> + other_usid = of_get_next_child(spmi_bus, other_usid); >> + ret = of_property_read_u32_array(other_usid, "reg", reg, 2); >> + if (ret) >> + return ERR_PTR(ret); >> + sdev = spmi_device_from_of(other_usid); >> + if (sdev == NULL) { >> + /* >> + * If the base USID for this PMIC hasn't probed yet >> + * but the secondary USID has, then we need to defer >> + * the function driver so that it will attempt to >> + * probe again when the base USID is ready. >> + */ >> + if (reg[0] == function_parent_usid - 1) >> + return ERR_PTR(-EPROBE_DEFER); >> + >> + continue; >> + } >> + >> + if (reg[0] == function_parent_usid - 1) >> + return spmi_device_get_drvdata(sdev); >> + } while (other_usid->sibling); >> + >> + return ERR_PTR(-ENODATA); >> +} >> +EXPORT_SYMBOL(qcom_pmic_get); >> + >> +static inline void pmic_print_info(struct device *dev, struct qcom_spmi_pmic *pmic) >> +{ >> + dev_dbg(dev, "%x: %s v%d.%d\n", >> + pmic->subtype, pmic->name, pmic->major, pmic->minor); >> +} >> + >> +static int pmic_spmi_load_revid(struct regmap *map, struct device *dev, >> + struct qcom_spmi_pmic *pmic) >> { >> - unsigned int rev2, minor, major, type, subtype; >> - const char *name = "unknown"; >> int ret, i; >> >> - ret = regmap_read(map, PMIC_TYPE, &type); >> + ret = regmap_read(map, PMIC_TYPE, &pmic->type); >> if (ret < 0) >> - return; >> + return ret; >> >> - if (type != PMIC_TYPE_VALUE) >> - return; >> + if (pmic->type != PMIC_TYPE_VALUE) >> + return ret; >> >> - ret = regmap_read(map, PMIC_SUBTYPE, &subtype); >> + ret = regmap_read(map, PMIC_SUBTYPE, &pmic->subtype); >> if (ret < 0) >> - return; >> + return ret; >> >> for (i = 0; i < ARRAY_SIZE(pmic_spmi_id_table); i++) { >> - if (subtype == (unsigned long)pmic_spmi_id_table[i].data) >> + if (pmic->subtype == (unsigned long)pmic_spmi_id_table[i].data) >> break; >> } >> >> if (i != ARRAY_SIZE(pmic_spmi_id_table)) >> - name = pmic_spmi_id_table[i].compatible; >> + pmic->name = devm_kstrdup_const(dev, pmic_spmi_id_table[i].compatible, GFP_KERNEL); >> >> - ret = regmap_read(map, PMIC_REV2, &rev2); >> + ret = regmap_read(map, PMIC_REV2, &pmic->rev2); >> if (ret < 0) >> - return; >> + return ret; >> >> - ret = regmap_read(map, PMIC_REV3, &minor); >> + ret = regmap_read(map, PMIC_REV3, &pmic->minor); >> if (ret < 0) >> - return; >> + return ret; >> >> - ret = regmap_read(map, PMIC_REV4, &major); >> + ret = regmap_read(map, PMIC_REV4, &pmic->major); >> if (ret < 0) >> - return; >> + return ret; >> >> /* >> * In early versions of PM8941 and PM8226, the major revision number >> @@ -124,14 +174,16 @@ static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) >> * Increment the major revision number here if the chip is an early >> * version of PM8941 or PM8226. >> */ >> - if ((subtype == PM8941_SUBTYPE || subtype == PM8226_SUBTYPE) && >> - major < 0x02) >> - major++; >> + if ((pmic->subtype == PM8941_SUBTYPE || pmic->subtype == PM8226_SUBTYPE) && >> + pmic->major < 0x02) >> + pmic->major++; >> + >> + if (pmic->subtype == PM8110_SUBTYPE) >> + pmic->minor = pmic->rev2; >> >> - if (subtype == PM8110_SUBTYPE) >> - minor = rev2; >> + pmic_print_info(dev, pmic); >> >> - dev_dbg(dev, "%x: %s v%d.%d\n", subtype, name, major, minor); >> + return 0; >> } >> >> static const struct regmap_config spmi_regmap_config = { >> @@ -144,14 +196,24 @@ static const struct regmap_config spmi_regmap_config = { >> static int pmic_spmi_probe(struct spmi_device *sdev) >> { >> struct regmap *regmap; >> + struct qcom_spmi_pmic *pmic; >> + int ret; >> >> regmap = devm_regmap_init_spmi_ext(sdev, &spmi_regmap_config); >> if (IS_ERR(regmap)) >> return PTR_ERR(regmap); >> >> + pmic = devm_kzalloc(&sdev->dev, sizeof(*pmic), GFP_KERNEL); >> + if (!pmic) >> + return -ENOMEM; >> + >> /* Only the first slave id for a PMIC contains this information */ >> - if (sdev->usid % 2 == 0) >> - pmic_spmi_show_revid(regmap, &sdev->dev); >> + if (sdev->usid % 2 == 0) { >> + ret = pmic_spmi_load_revid(regmap, &sdev->dev, pmic); >> + if (ret < 0) >> + return ret; >> + spmi_device_set_drvdata(sdev, pmic); >> + } >> >> return devm_of_platform_populate(&sdev->dev); >> } >> diff --git a/include/soc/qcom/qcom-spmi-pmic.h b/include/soc/qcom/qcom-spmi-pmic.h >> new file mode 100644 >> index 000000000000..a8a77be22cfc >> --- /dev/null >> +++ b/include/soc/qcom/qcom-spmi-pmic.h >> @@ -0,0 +1,60 @@ >> +/* SPDX-License-Identifier: GPL-2.0-only */ >> +/* Copyright (c) 2021 Linaro. All rights reserved. >> + * Copyright (c) 2021 Caleb Connolly <caleb.connolly@linaro.org> >> + */ >> + >> +#ifndef __QCOM_PMIC_H__ >> +#define __QCOM_PMIC_H__ >> + >> +#define COMMON_SUBTYPE 0x00 >> +#define PM8941_SUBTYPE 0x01 >> +#define PM8841_SUBTYPE 0x02 >> +#define PM8019_SUBTYPE 0x03 >> +#define PM8226_SUBTYPE 0x04 >> +#define PM8110_SUBTYPE 0x05 >> +#define PMA8084_SUBTYPE 0x06 >> +#define PMI8962_SUBTYPE 0x07 >> +#define PMD9635_SUBTYPE 0x08 >> +#define PM8994_SUBTYPE 0x09 >> +#define PMI8994_SUBTYPE 0x0a >> +#define PM8916_SUBTYPE 0x0b >> +#define PM8004_SUBTYPE 0x0c >> +#define PM8909_SUBTYPE 0x0d >> +#define PM8028_SUBTYPE 0x0e >> +#define PM8901_SUBTYPE 0x0f >> +#define PM8950_SUBTYPE 0x10 >> +#define PMI8950_SUBTYPE 0x11 >> +#define PM8998_SUBTYPE 0x14 >> +#define PMI8998_SUBTYPE 0x15 >> +#define PM8005_SUBTYPE 0x18 >> +#define PM660L_SUBTYPE 0x1A >> +#define PM660_SUBTYPE 0x1B >> +#define PM8150_SUBTYPE 0x1E >> +#define PM8150L_SUBTYPE 0x1f >> +#define PM8150B_SUBTYPE 0x20 >> +#define PMK8002_SUBTYPE 0x21 >> +#define PM8009_SUBTYPE 0x24 >> +#define PM8150C_SUBTYPE 0x26 >> +#define SMB2351_SUBTYPE 0x29 >> + >> +#define PMI8998_FAB_ID_SMIC 0x11 >> +#define PMI8998_FAB_ID_GF 0x30 >> + >> +#define PM660_FAB_ID_GF 0x0 >> +#define PM660_FAB_ID_TSMC 0x2 >> +#define PM660_FAB_ID_MX 0x3 >> + >> +struct qcom_spmi_pmic { >> + unsigned int type; >> + unsigned int subtype; >> + unsigned int major; >> + unsigned int minor; >> + unsigned int rev2; >> + const char *name; >> +}; >> + >> +struct device; >> + >> +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev); >> + >> +#endif /* __QCOM_PMIC_H__ */ >> -- >> 2.35.1 >> > >
On Mon, 28 Feb 2022 at 21:08, Caleb Connolly <caleb.connolly@linaro.org> wrote: > > > > On 26/02/2022 18:09, Dmitry Baryshkov wrote: > > On Tue, 22 Feb 2022 at 01:08, Caleb Connolly <caleb.connolly@linaro.org> wrote: > >> > >> Some PMIC functions such as the RRADC need to be aware of the PMIC > >> chip revision information to implement errata or otherwise adjust > >> behaviour, export the PMIC information to enable this. > >> > >> This is specifically required to enable the RRADC to adjust > >> coefficients based on which chip fab the PMIC was produced in, > >> this can vary per unique device and therefore has to be read at > >> runtime. > >> > >> [bugs in previous revision] > >> Reported-by: kernel test robot <lkp@intel.com> > >> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > >> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> > >> --- > >> drivers/mfd/qcom-spmi-pmic.c | 174 ++++++++++++++++++++---------- > >> include/soc/qcom/qcom-spmi-pmic.h | 60 +++++++++++ > >> 2 files changed, 178 insertions(+), 56 deletions(-) > >> create mode 100644 include/soc/qcom/qcom-spmi-pmic.h > >> > >> diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c > >> index 1cacc00aa6c9..1ef426a1513b 100644 > >> --- a/drivers/mfd/qcom-spmi-pmic.c > >> +++ b/drivers/mfd/qcom-spmi-pmic.c > >> @@ -3,11 +3,16 @@ > >> * Copyright (c) 2014, The Linux Foundation. All rights reserved. > >> */ > >> > >> +#include <linux/device.h> > >> +#include <linux/errno.h> > >> +#include <linux/gfp.h> > >> #include <linux/kernel.h> > >> #include <linux/module.h> > >> #include <linux/spmi.h> > >> +#include <linux/types.h> > >> #include <linux/regmap.h> > >> #include <linux/of_platform.h> > >> +#include <soc/qcom/qcom-spmi-pmic.h> > >> > >> #define PMIC_REV2 0x101 > >> #define PMIC_REV3 0x102 > >> @@ -17,37 +22,6 @@ > >> > >> #define PMIC_TYPE_VALUE 0x51 > >> > >> -#define COMMON_SUBTYPE 0x00 > >> -#define PM8941_SUBTYPE 0x01 > >> -#define PM8841_SUBTYPE 0x02 > >> -#define PM8019_SUBTYPE 0x03 > >> -#define PM8226_SUBTYPE 0x04 > >> -#define PM8110_SUBTYPE 0x05 > >> -#define PMA8084_SUBTYPE 0x06 > >> -#define PMI8962_SUBTYPE 0x07 > >> -#define PMD9635_SUBTYPE 0x08 > >> -#define PM8994_SUBTYPE 0x09 > >> -#define PMI8994_SUBTYPE 0x0a > >> -#define PM8916_SUBTYPE 0x0b > >> -#define PM8004_SUBTYPE 0x0c > >> -#define PM8909_SUBTYPE 0x0d > >> -#define PM8028_SUBTYPE 0x0e > >> -#define PM8901_SUBTYPE 0x0f > >> -#define PM8950_SUBTYPE 0x10 > >> -#define PMI8950_SUBTYPE 0x11 > >> -#define PM8998_SUBTYPE 0x14 > >> -#define PMI8998_SUBTYPE 0x15 > >> -#define PM8005_SUBTYPE 0x18 > >> -#define PM660L_SUBTYPE 0x1A > >> -#define PM660_SUBTYPE 0x1B > >> -#define PM8150_SUBTYPE 0x1E > >> -#define PM8150L_SUBTYPE 0x1f > >> -#define PM8150B_SUBTYPE 0x20 > >> -#define PMK8002_SUBTYPE 0x21 > >> -#define PM8009_SUBTYPE 0x24 > >> -#define PM8150C_SUBTYPE 0x26 > >> -#define SMB2351_SUBTYPE 0x29 > >> - > >> static const struct of_device_id pmic_spmi_id_table[] = { > >> { .compatible = "qcom,pm660", .data = (void *)PM660_SUBTYPE }, > >> { .compatible = "qcom,pm660l", .data = (void *)PM660L_SUBTYPE }, > >> @@ -81,42 +55,118 @@ static const struct of_device_id pmic_spmi_id_table[] = { > >> { } > >> }; > >> > >> -static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) > >> +/** > >> + * qcom_pmic_get() - Get a pointer to the base PMIC device > >> + * > >> + * @dev: the pmic function device > >> + * @return: the struct qcom_spmi_pmic* pointer associated with the function device > >> + * > >> + * A PMIC can be represented by multiple SPMI devices, but > >> + * only the base PMIC device will contain a reference to > >> + * the revision information. > >> + * > >> + * This function takes a pointer to a function device and > >> + * returns a pointer to the base PMIC device. > >> + */ > >> +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev) > >> +{ > >> + struct spmi_device *sdev; > >> + struct device_node *spmi_bus; > >> + struct device_node *other_usid = NULL; > >> + int function_parent_usid, ret; > >> + u32 reg[2]; > >> + > >> + if (!of_match_device(pmic_spmi_id_table, dev->parent)) > >> + return ERR_PTR(-EINVAL); > >> + > >> + sdev = to_spmi_device(dev->parent); > >> + if (!sdev) > >> + return ERR_PTR(-EINVAL); > >> + > >> + /* > >> + * Quick return if the function device is already in the right > >> + * USID > >> + */ > >> + if (sdev->usid % 2 == 0) > >> + return spmi_device_get_drvdata(sdev); > > > >> + > >> + function_parent_usid = sdev->usid; > >> + > >> + /* > >> + * Walk through the list of PMICs until we find the sibling USID. > >> + * The goal is the find to previous sibling. Assuming there is no > >> + * PMIC with more than 2 USIDs. We know that function_parent_usid > >> + * is one greater than the base USID. > >> + */ > > > Hi Dmitry, > > I think this is not correct for newer platforms. On SM8450 we have > > PMICs which do not share a pair of USIDs. > > For example on sm8450-qrd: > > > > PMK8350 @ 0 > > PM8350 @ 1 > > PM8350C @ 2 > > PM8350B @ 3 > > PMR735A @ 4 > > PMR735B @ 5 > > PM8450 @ 7 > Huh alright, I see a few ways we can deal with this, as if this is the case then I think the existing logic in probe > (which only prints the PMIC information) would need to be fixed either way. > > Could you clarify if these PMICs have only one USID, or if for example PM8350[ABC] is a PMIC with 4 USIDs? They are different PMICs. > > None of these PMICs seem to be referenced in the PMIC match table, they aren't in mainline yet? socinfo is added in this patch: https://lore.kernel.org/all/20220210051043.748275-1-bjorn.andersson@linaro.org/ For the qcom-spmi-pmic driver they use the generic "qcom,spmi-pmic" compatibility string. > > If I rework the logic to use shared compatible strings to find the base PMIC (by finding the matching USID with the > smallest address) maybe that would be an acceptable solution, although that would break if a device has more than one of > a single pmic... > > Perhaps for now we could limit the logic to only run for pm(i)8998 and pm660 and return `-EINVAL` with a WARN for other > PMICs, as these two are the only ones with drivers that would use this functionality for now, and it can be fixed up for > newer PMICs in the future if needed. I suspect that the correct way would be to replace the match data with the struct describing whether the PMIC spans two USIDs or just one. I think we can drop current match data, it can be read from the PMIC itself. The single-USID pmics also can be removed from the match table provided the dts files use generic binding too. > > Let me know what you think.> > >> + spmi_bus = of_get_parent(sdev->dev.parent->of_node); > >> + do { > >> + other_usid = of_get_next_child(spmi_bus, other_usid); > >> + ret = of_property_read_u32_array(other_usid, "reg", reg, 2); > >> + if (ret) > >> + return ERR_PTR(ret); > >> + sdev = spmi_device_from_of(other_usid); > >> + if (sdev == NULL) { > >> + /* > >> + * If the base USID for this PMIC hasn't probed yet > >> + * but the secondary USID has, then we need to defer > >> + * the function driver so that it will attempt to > >> + * probe again when the base USID is ready. > >> + */ > >> + if (reg[0] == function_parent_usid - 1) > >> + return ERR_PTR(-EPROBE_DEFER); > >> + > >> + continue; > >> + } > >> + > >> + if (reg[0] == function_parent_usid - 1) > >> + return spmi_device_get_drvdata(sdev); > >> + } while (other_usid->sibling); > >> + > >> + return ERR_PTR(-ENODATA); > >> +} > >> +EXPORT_SYMBOL(qcom_pmic_get); > >> + > >> +static inline void pmic_print_info(struct device *dev, struct qcom_spmi_pmic *pmic) > >> +{ > >> + dev_dbg(dev, "%x: %s v%d.%d\n", > >> + pmic->subtype, pmic->name, pmic->major, pmic->minor); > >> +} > >> + > >> +static int pmic_spmi_load_revid(struct regmap *map, struct device *dev, > >> + struct qcom_spmi_pmic *pmic) > >> { > >> - unsigned int rev2, minor, major, type, subtype; > >> - const char *name = "unknown"; > >> int ret, i; > >> > >> - ret = regmap_read(map, PMIC_TYPE, &type); > >> + ret = regmap_read(map, PMIC_TYPE, &pmic->type); > >> if (ret < 0) > >> - return; > >> + return ret; > >> > >> - if (type != PMIC_TYPE_VALUE) > >> - return; > >> + if (pmic->type != PMIC_TYPE_VALUE) > >> + return ret; > >> > >> - ret = regmap_read(map, PMIC_SUBTYPE, &subtype); > >> + ret = regmap_read(map, PMIC_SUBTYPE, &pmic->subtype); > >> if (ret < 0) > >> - return; > >> + return ret; > >> > >> for (i = 0; i < ARRAY_SIZE(pmic_spmi_id_table); i++) { > >> - if (subtype == (unsigned long)pmic_spmi_id_table[i].data) > >> + if (pmic->subtype == (unsigned long)pmic_spmi_id_table[i].data) > >> break; > >> } > >> > >> if (i != ARRAY_SIZE(pmic_spmi_id_table)) > >> - name = pmic_spmi_id_table[i].compatible; > >> + pmic->name = devm_kstrdup_const(dev, pmic_spmi_id_table[i].compatible, GFP_KERNEL); > >> > >> - ret = regmap_read(map, PMIC_REV2, &rev2); > >> + ret = regmap_read(map, PMIC_REV2, &pmic->rev2); > >> if (ret < 0) > >> - return; > >> + return ret; > >> > >> - ret = regmap_read(map, PMIC_REV3, &minor); > >> + ret = regmap_read(map, PMIC_REV3, &pmic->minor); > >> if (ret < 0) > >> - return; > >> + return ret; > >> > >> - ret = regmap_read(map, PMIC_REV4, &major); > >> + ret = regmap_read(map, PMIC_REV4, &pmic->major); > >> if (ret < 0) > >> - return; > >> + return ret; > >> > >> /* > >> * In early versions of PM8941 and PM8226, the major revision number > >> @@ -124,14 +174,16 @@ static void pmic_spmi_show_revid(struct regmap *map, struct device *dev) > >> * Increment the major revision number here if the chip is an early > >> * version of PM8941 or PM8226. > >> */ > >> - if ((subtype == PM8941_SUBTYPE || subtype == PM8226_SUBTYPE) && > >> - major < 0x02) > >> - major++; > >> + if ((pmic->subtype == PM8941_SUBTYPE || pmic->subtype == PM8226_SUBTYPE) && > >> + pmic->major < 0x02) > >> + pmic->major++; > >> + > >> + if (pmic->subtype == PM8110_SUBTYPE) > >> + pmic->minor = pmic->rev2; > >> > >> - if (subtype == PM8110_SUBTYPE) > >> - minor = rev2; > >> + pmic_print_info(dev, pmic); > >> > >> - dev_dbg(dev, "%x: %s v%d.%d\n", subtype, name, major, minor); > >> + return 0; > >> } > >> > >> static const struct regmap_config spmi_regmap_config = { > >> @@ -144,14 +196,24 @@ static const struct regmap_config spmi_regmap_config = { > >> static int pmic_spmi_probe(struct spmi_device *sdev) > >> { > >> struct regmap *regmap; > >> + struct qcom_spmi_pmic *pmic; > >> + int ret; > >> > >> regmap = devm_regmap_init_spmi_ext(sdev, &spmi_regmap_config); > >> if (IS_ERR(regmap)) > >> return PTR_ERR(regmap); > >> > >> + pmic = devm_kzalloc(&sdev->dev, sizeof(*pmic), GFP_KERNEL); > >> + if (!pmic) > >> + return -ENOMEM; > >> + > >> /* Only the first slave id for a PMIC contains this information */ > >> - if (sdev->usid % 2 == 0) > >> - pmic_spmi_show_revid(regmap, &sdev->dev); > >> + if (sdev->usid % 2 == 0) { > >> + ret = pmic_spmi_load_revid(regmap, &sdev->dev, pmic); > >> + if (ret < 0) > >> + return ret; > >> + spmi_device_set_drvdata(sdev, pmic); > >> + } > >> > >> return devm_of_platform_populate(&sdev->dev); > >> } > >> diff --git a/include/soc/qcom/qcom-spmi-pmic.h b/include/soc/qcom/qcom-spmi-pmic.h > >> new file mode 100644 > >> index 000000000000..a8a77be22cfc > >> --- /dev/null > >> +++ b/include/soc/qcom/qcom-spmi-pmic.h > >> @@ -0,0 +1,60 @@ > >> +/* SPDX-License-Identifier: GPL-2.0-only */ > >> +/* Copyright (c) 2021 Linaro. All rights reserved. > >> + * Copyright (c) 2021 Caleb Connolly <caleb.connolly@linaro.org> > >> + */ > >> + > >> +#ifndef __QCOM_PMIC_H__ > >> +#define __QCOM_PMIC_H__ > >> + > >> +#define COMMON_SUBTYPE 0x00 > >> +#define PM8941_SUBTYPE 0x01 > >> +#define PM8841_SUBTYPE 0x02 > >> +#define PM8019_SUBTYPE 0x03 > >> +#define PM8226_SUBTYPE 0x04 > >> +#define PM8110_SUBTYPE 0x05 > >> +#define PMA8084_SUBTYPE 0x06 > >> +#define PMI8962_SUBTYPE 0x07 > >> +#define PMD9635_SUBTYPE 0x08 > >> +#define PM8994_SUBTYPE 0x09 > >> +#define PMI8994_SUBTYPE 0x0a > >> +#define PM8916_SUBTYPE 0x0b > >> +#define PM8004_SUBTYPE 0x0c > >> +#define PM8909_SUBTYPE 0x0d > >> +#define PM8028_SUBTYPE 0x0e > >> +#define PM8901_SUBTYPE 0x0f > >> +#define PM8950_SUBTYPE 0x10 > >> +#define PMI8950_SUBTYPE 0x11 > >> +#define PM8998_SUBTYPE 0x14 > >> +#define PMI8998_SUBTYPE 0x15 > >> +#define PM8005_SUBTYPE 0x18 > >> +#define PM660L_SUBTYPE 0x1A > >> +#define PM660_SUBTYPE 0x1B > >> +#define PM8150_SUBTYPE 0x1E > >> +#define PM8150L_SUBTYPE 0x1f > >> +#define PM8150B_SUBTYPE 0x20 > >> +#define PMK8002_SUBTYPE 0x21 > >> +#define PM8009_SUBTYPE 0x24 > >> +#define PM8150C_SUBTYPE 0x26 > >> +#define SMB2351_SUBTYPE 0x29 > >> + > >> +#define PMI8998_FAB_ID_SMIC 0x11 > >> +#define PMI8998_FAB_ID_GF 0x30 > >> + > >> +#define PM660_FAB_ID_GF 0x0 > >> +#define PM660_FAB_ID_TSMC 0x2 > >> +#define PM660_FAB_ID_MX 0x3 > >> + > >> +struct qcom_spmi_pmic { > >> + unsigned int type; > >> + unsigned int subtype; > >> + unsigned int major; > >> + unsigned int minor; > >> + unsigned int rev2; > >> + const char *name; > >> +}; > >> + > >> +struct device; > >> + > >> +const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev); > >> + > >> +#endif /* __QCOM_PMIC_H__ */ > >> -- > >> 2.35.1 > >> > > > > > > -- > Kind Regards, > Caleb (they/them)
The RRADC is responsible for reading data about the current and voltage from the USB or DC in jacks, it can also read the battery ID (resistence) and some temperatures. It is found on the PMI8998 and PM660 Qualcomm PMICs. The RRADC has to calibrate some ADC values based on which chip fab the PMIC was produced in, to facilitate this the patches ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients") and ("mfd: qcom-spmi-pmic: read fab id on supported PMICs") expose the PMIC revision information and fab_id as a struct and register them as driver data in the Qualcomm SPMI PMIC driver so that it can be read by the RRADC. The first 3 patches add support for looking up an SPMI device from a struct device_node, as well as introducing support for looking up the base USID of a Qcom PMIC, see patch comments for more details. These Address Bjorns comments on v2. Changes since v7: * Addressed Jonathans comments * Fixed bug reported by LKP Changes since v6: * Fix printf format warning in rradc Changes since v5: * Add missing EXPORT_SYMBOL_GPL() to ("spmi: add a helper to look up an SPMI device from a device node") Changes since v4: * Addressed Jonathan's comments on v4 * Reworked the qcom-spmi-pmic patches to properly walk the devicetree to find the base USID. I've tested this on SDM845 which has two PMICs (pm8998 and pmi8998) and I'm able to look up the PMIC revid from all 4 USIDs. Changes since v3: * Split PMIC patch in two, rework to support function drivers on a sibling USID * Completely rework RRADC driver to make use of the modern IIO framework. This required re-arranging a lot of the equations and results in some lost precision, where relevant I've left comments to explain this. I don't think any of it is significant enough to justify doing post-processing in driver. Thanks a lot Jonathan and John Stultz for helping me out with this Changes since v2: * Add missing include (thanks kernel test robot :D) * Rework some confusing function return values, specifically rradc_read_status_in_cont_mode and rradc_prepare_batt_id_conversion both of which didn't correctly handle "ret". This also bought up an issue as the previous implementation didn't actually wait for the channel to be ready. It doesn't seem like that's strictly necessary (same data is reported if I wait for the status to be good or not) but I've included it anyway for good measure. Changes since v1: * Rework the RRADC driver based on Jonathan's feedback * Pick up Rob's reviewed by for the dt-binding patch. -- Caleb Connolly (9): spmi: add a helper to look up an SPMI device from a device node mfd: qcom-spmi-pmic: expose the PMIC revid information to clients mfd: qcom-spmi-pmic: read fab id on supported PMICs dt-bindings: iio: adc: document qcom-spmi-rradc iio: adc: qcom-spmi-rradc: introduce round robin adc arm64: dts: qcom: pmi8998: add rradc node arm64: dts: qcom: sdm845-oneplus: enable rradc arm64: dts: qcom: sdm845-db845c: enable rradc arm64: dts: qcom: sdm845-xiaomi-beryllium: enable rradc .../bindings/iio/adc/qcom,spmi-rradc.yaml | 54 + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 8 + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 4 + .../boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 4 + drivers/iio/adc/Kconfig | 12 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/qcom-spmi-rradc.c | 1011 +++++++++++++++++ drivers/mfd/qcom-spmi-pmic.c | 181 ++- drivers/spmi/spmi.c | 17 + include/linux/spmi.h | 2 + include/soc/qcom/qcom-spmi-pmic.h | 61 + 12 files changed, 1303 insertions(+), 56 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml create mode 100644 drivers/iio/adc/qcom-spmi-rradc.c create mode 100644 include/soc/qcom/qcom-spmi-pmic.h