On 9/8/22 04:14, Krzysztof Kozlowski wrote:
> On 07/09/2022 22:15, Anjelique Melendez wrote:
>> From: Anirudh Ghayal <quic_aghayal@xxxxxxxxxxx>
>>
>> The SPMI based PMICs have the HIGH and LOW GPIO output
>> strength mappings interchanged, fix them.
>>
>> Keep the mapping same for older SSBI based PMICs.
>>
>> CRs-Fixed: 2246473
>
> What is this tag about?
This is for internal tracking. It will be removed in the next version
of this patch series.
>> drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +-
>> drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 4 ++--
>> include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 9 +++++++--
>> 3 files changed, 10 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
>> index cf6b6047de8d..fceccf1ec099 100644
>> --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
>> +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
>> @@ -525,7 +525,7 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
>> pad->pullup = arg;
>> break;
>> case PMIC_GPIO_CONF_STRENGTH:
>> - if (arg > PMIC_GPIO_STRENGTH_LOW)
>> + if (arg > PMIC_GPIO_STRENGTH_HIGH)
>> return -EINVAL;
>> pad->strength = arg;
>> break;
>> diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
>> index 1b41adda8129..0f96d130813b 100644
>> --- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
>> +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
>> @@ -1,7 +1,7 @@
>> // SPDX-License-Identifier: GPL-2.0-only
>> /*
>> * Copyright (c) 2015, Sony Mobile Communications AB.
>> - * Copyright (c) 2013, The Linux Foundation. All rights reserved.
>> + * Copyright (c) 2013, 2018 The Linux Foundation. All rights reserved.
>> */
>>
>> #include <linux/module.h>
>> @@ -371,7 +371,7 @@ static int pm8xxx_pin_config_set(struct pinctrl_dev *pctldev,
>> banks |= BIT(0);
>> break;
>> case PM8XXX_QCOM_DRIVE_STRENGH:
>> - if (arg > PMIC_GPIO_STRENGTH_LOW) {
>> + if (arg > PM8921_GPIO_STRENGTH_LOW) {
>> dev_err(pctrl->dev, "invalid drive strength\n");
>> return -EINVAL;
>> }
>> diff --git a/include/dt-bindings/pinctrl/qcom,pmic-gpio.h b/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
>> index e5df5ce45a0f..950be952ad3e 100644
>> --- a/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
>> +++ b/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
>
> You cannot mix bindings with driver. This is an ABI break.
This could be split into two patches. However, both would need to make
it into any given build to avoid runtime regressions when
pinctrl-spmi-gpio.c rejects GPIO strength configurations larger than 1.
I suppose that this kind of bi-directional dependency could be avoided
by using one of these checks instead in the driver:
if (arg > 3) {
or
if (arg > max(PMIC_GPIO_STRENGTH_LOW, PMIC_GPIO_STRENGTH_HIGH))
Going this route would only require that the driver patch is picked up
before the DT header patch.
>> @@ -12,9 +12,14 @@
>> #define PMIC_GPIO_PULL_UP_1P5_30 3
>>
>> #define PMIC_GPIO_STRENGTH_NO 0
>> -#define PMIC_GPIO_STRENGTH_HIGH 1
>> +#define PMIC_GPIO_STRENGTH_LOW 1
>> #define PMIC_GPIO_STRENGTH_MED 2
>> -#define PMIC_GPIO_STRENGTH_LOW 3
>> +#define PMIC_GPIO_STRENGTH_HIGH 3
>
> Didn't you just break all DTSes in the world?
Currently, all PMIC GPIO peripherals managed by the pinctrl-spmi-gpio
driver are having their drive strength control register programmed
incorrectly at runtime for the constant name used in DT (i.e.
PMIC_GPIO_STRENGTH_LOW vs PMIC_GPIO_STRENGTH_HIGH). Changing the values
of those constants as done in this patch fixes that incorrect behavior.
The qcom,drive-strength DT property is taking a raw drive strength
control register value instead of some logical strength abstraction.
I'm not sure of a better way to handle the situation than fixing the
incorrect drive strength constant to register value mapping as defined
in qcom,pmic-gpio.h.
Changing the mapping in qcom,pmic-gpio.h without updating any dtsi files
could cause a problem for very old targets that use SSBI instead of SPMI
for PMIC communication. However, for there to actually be a problem,
PMIC_GPIO_STRENGTH_LOW or PMIC_GPIO_STRENGTH_HIGH would need to be
specified for the SSBI PMIC. That would be GPIO devices with compatible
strings: "qcom,pm8018-gpio", "qcom,pm8038-gpio", "qcom,pm8058-gpio",
"qcom,pm8917-gpio", or "qcom,pm8921-gpio". I could find no instances of
this situation in the kernel source tree.
The PMIC_GPIO_STRENGTH_LOW or PMIC_GPIO_STRENGTH_HIGH usage in dtsi
files for SPMI PMICs does not need to be modified. The DT header patch
fixes configurations that are currently broken for them.
Note that the drive strength misconfiguration issue doesn't present a
problem for commercial products as this patch has been cherry-picked
downstream for several years.
Take care,
David
