| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 12 Nov 2018 17:29:01 +0100
From: Parthiban Nallathambi <pn@...x.de>
To: Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>,
Saravanan Sekar <sravanhome@...il.com>
Cc: pn@...x.de, linus.walleij@...aro.org, robh+dt@...nel.org,
mark.rutland@....com, afaerber@...e.de, catalin.marinas@....com,
will.deacon@....com, linux-gpio@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, mp-cs@...ions-semi.com,
thomas.liau@...ions-semi.com, linux@...ietech.com
Subject: Re: [PATCH v5 2/5] pinctrl: actions: define pad control configurtion
to SoC specific
On 8/29/18 5:32 PM, Manivannan Sadhasivam wrote:
> On Wed, Aug 29, 2018 at 10:24:10AM +0200, Saravanan Sekar wrote:
>> pad control for s900 and s700 are differs in number of
>> pull control configuraions
>> s900 has 4 pull controls - high impedence, pull up, pull down, repeater
>> s700, s500 has 2 pull controls - pull up and pull down
>>
>> so pad control configuration has to SoC specific, moved out from pinctrl
>> common to s700, s900 specific.
>>
>
> This patch is not adding anything for S700 so no need to mention it in
> last line.
Agreed!
>
>> Signed-off-by: Parthiban Nallathambi <pn@...x.de>
>> Signed-off-by: Saravanan Sekar <sravanhome@...il.com>
>> ---
>> drivers/pinctrl/actions/pinctrl-owl.c | 64 +++++----------------------------
>> drivers/pinctrl/actions/pinctrl-owl.h | 13 ++++---
>> drivers/pinctrl/actions/pinctrl-s900.c | 66 +++++++++++++++++++++++++++++++++-
>> 3 files changed, 79 insertions(+), 64 deletions(-)
>>
>> diff --git a/drivers/pinctrl/actions/pinctrl-owl.c b/drivers/pinctrl/actions/pinctrl-owl.c
>> index 9d18c02f192b..cc242d6a47c3 100644
>> --- a/drivers/pinctrl/actions/pinctrl-owl.c
>> +++ b/drivers/pinctrl/actions/pinctrl-owl.c
>> @@ -246,60 +246,6 @@ static int owl_pad_pinconf_reg(const struct owl_padinfo *info,
>> return 0;
>> }
>>
>> -static int owl_pad_pinconf_arg2val(const struct owl_padinfo *info,
>> - unsigned int param,
>> - u32 *arg)
>> -{
>> - switch (param) {
>> - case PIN_CONFIG_BIAS_BUS_HOLD:
>> - *arg = OWL_PINCONF_PULL_HOLD;
>> - break;
>> - case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:
>> - *arg = OWL_PINCONF_PULL_HIZ;
>> - break;
>> - case PIN_CONFIG_BIAS_PULL_DOWN:
>> - *arg = OWL_PINCONF_PULL_DOWN;
>> - break;
>> - case PIN_CONFIG_BIAS_PULL_UP:
>> - *arg = OWL_PINCONF_PULL_UP;
>> - break;
>> - case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
>> - *arg = (*arg >= 1 ? 1 : 0);
>> - break;
>> - default:
>> - return -ENOTSUPP;
>> - }
>> -
>> - return 0;
>> -}
>> -
>> -static int owl_pad_pinconf_val2arg(const struct owl_padinfo *padinfo,
>> - unsigned int param,
>> - u32 *arg)
>> -{
>> - switch (param) {
>> - case PIN_CONFIG_BIAS_BUS_HOLD:
>> - *arg = *arg == OWL_PINCONF_PULL_HOLD;
>> - break;
>> - case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:
>> - *arg = *arg == OWL_PINCONF_PULL_HIZ;
>> - break;
>> - case PIN_CONFIG_BIAS_PULL_DOWN:
>> - *arg = *arg == OWL_PINCONF_PULL_DOWN;
>> - break;
>> - case PIN_CONFIG_BIAS_PULL_UP:
>> - *arg = *arg == OWL_PINCONF_PULL_UP;
>> - break;
>> - case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
>> - *arg = *arg == 1;
>> - break;
>> - default:
>> - return -ENOTSUPP;
>> - }
>> -
>> - return 0;
>> -}
>> -
>> static int owl_pin_config_get(struct pinctrl_dev *pctrldev,
>> unsigned int pin,
>> unsigned long *config)
>> @@ -318,7 +264,10 @@ static int owl_pin_config_get(struct pinctrl_dev *pctrldev,
>>
>> arg = owl_read_field(pctrl, reg, bit, width);
>>
>> - ret = owl_pad_pinconf_val2arg(info, param, &arg);
>> + if (!pctrl->soc->padctl_val2arg)
>> + return -ENOTSUPP;
>> +
>> + ret = pctrl->soc->padctl_val2arg(info, param, &arg);
>> if (ret)
>> return ret;
>>
>> @@ -349,7 +298,10 @@ static int owl_pin_config_set(struct pinctrl_dev *pctrldev,
>> if (ret)
>> return ret;
>>
>> - ret = owl_pad_pinconf_arg2val(info, param, &arg);
>> + if (!pctrl->soc->padctl_arg2val)
>> + return -ENOTSUPP;
>> +
>> + ret = pctrl->soc->padctl_arg2val(info, param, &arg);
>> if (ret)
>> return ret;
>>
>> diff --git a/drivers/pinctrl/actions/pinctrl-owl.h b/drivers/pinctrl/actions/pinctrl-owl.h
>> index 31cc33d7c4a5..dae2e8363fd5 100644
>> --- a/drivers/pinctrl/actions/pinctrl-owl.h
>> +++ b/drivers/pinctrl/actions/pinctrl-owl.h
>> @@ -145,13 +145,6 @@
>> .shared_ctl_offset = _share, \
>> }
>>
>> -enum owl_pinconf_pull {
>> - OWL_PINCONF_PULL_HIZ,
>> - OWL_PINCONF_PULL_DOWN,
>> - OWL_PINCONF_PULL_UP,
>> - OWL_PINCONF_PULL_HOLD,
>> -};
>> -
>> enum owl_pinconf_drv {
>> OWL_PINCONF_DRV_2MA,
>> OWL_PINCONF_DRV_4MA,
>> @@ -305,6 +298,12 @@ struct owl_pinctrl_soc_data {
>> unsigned int ngpios;
>> const struct owl_gpio_port *ports;
>> unsigned int nports;
>> + int (*padctl_val2arg)(const struct owl_padinfo *padinfo,
>> + unsigned int param,
>> + u32 *arg);
>> + int (*padctl_arg2val)(const struct owl_padinfo *info,
>> + unsigned int param,
>> + u32 *arg);
>> };
>>
>> int owl_pinctrl_probe(struct platform_device *pdev,
>> diff --git a/drivers/pinctrl/actions/pinctrl-s900.c b/drivers/pinctrl/actions/pinctrl-s900.c
>> index 0597009d8369..2e19fecbe5e9 100644
>> --- a/drivers/pinctrl/actions/pinctrl-s900.c
>> +++ b/drivers/pinctrl/actions/pinctrl-s900.c
>> @@ -13,6 +13,7 @@
>> #include <linux/of.h>
>> #include <linux/platform_device.h>
>> #include <linux/pinctrl/pinctrl.h>
>> +#include <linux/pinctrl/pinconf-generic.h>
>> #include "pinctrl-owl.h"
>>
>> /* Pinctrl registers offset */
>> @@ -1717,6 +1718,67 @@ static const struct owl_gpio_port s900_gpio_ports[] = {
>> OWL_GPIO_PORT(F, 0x00F0, 8, 0x0, 0x4, 0x8, 0x460, 0x140, 0x144, 0x178, 0)
>> };
>>
>> +enum owl_pinconf_pull {
>
> Since this enum is SoC specific, it could be s900_pinconf_pull.
Agreed!
Thanks,
Parthi
>
> Regards,
> Mani
>
>> + OWL_PINCONF_PULL_HIZ,
>> + OWL_PINCONF_PULL_DOWN,
>> + OWL_PINCONF_PULL_UP,
>> + OWL_PINCONF_PULL_HOLD,
>> +};
>> +
>> +static int s900_pad_pinconf_arg2val(const struct owl_padinfo *info,
>> + unsigned int param,
>> + u32 *arg)
>> +{
>> + switch (param) {
>> + case PIN_CONFIG_BIAS_BUS_HOLD:
>> + *arg = OWL_PINCONF_PULL_HOLD;
>> + break;
>> + case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:
>> + *arg = OWL_PINCONF_PULL_HIZ;
>> + break;
>> + case PIN_CONFIG_BIAS_PULL_DOWN:
>> + *arg = OWL_PINCONF_PULL_DOWN;
>> + break;
>> + case PIN_CONFIG_BIAS_PULL_UP:
>> + *arg = OWL_PINCONF_PULL_UP;
>> + break;
>> + case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
>> + *arg = (*arg >= 1 ? 1 : 0);
>> + break;
>> + default:
>> + return -ENOTSUPP;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int s900_pad_pinconf_val2arg(const struct owl_padinfo *padinfo,
>> + unsigned int param,
>> + u32 *arg)
>> +{
>> + switch (param) {
>> + case PIN_CONFIG_BIAS_BUS_HOLD:
>> + *arg = *arg == OWL_PINCONF_PULL_HOLD;
>> + break;
>> + case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:
>> + *arg = *arg == OWL_PINCONF_PULL_HIZ;
>> + break;
>> + case PIN_CONFIG_BIAS_PULL_DOWN:
>> + *arg = *arg == OWL_PINCONF_PULL_DOWN;
>> + break;
>> + case PIN_CONFIG_BIAS_PULL_UP:
>> + *arg = *arg == OWL_PINCONF_PULL_UP;
>> + break;
>> + case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
>> + *arg = *arg == 1;
>> + break;
>> + default:
>> + return -ENOTSUPP;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> static struct owl_pinctrl_soc_data s900_pinctrl_data = {
>> .padinfo = s900_padinfo,
>> .pins = (const struct pinctrl_pin_desc *)s900_pads,
>> @@ -1727,7 +1789,9 @@ static struct owl_pinctrl_soc_data s900_pinctrl_data = {
>> .ngroups = ARRAY_SIZE(s900_groups),
>> .ngpios = NUM_GPIOS,
>> .ports = s900_gpio_ports,
>> - .nports = ARRAY_SIZE(s900_gpio_ports)
>> + .nports = ARRAY_SIZE(s900_gpio_ports),
>> + .padctl_arg2val = s900_pad_pinconf_arg2val,
>> + .padctl_val2arg = s900_pad_pinconf_val2arg,
>> };
>>
>> static int s900_pinctrl_probe(struct platform_device *pdev)
>> --
>> 2.14.4
>>
>
--
Thanks,
Parthiban N
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-22 Fax: (+49)-8142-66989-80 Email: pn@...x.de
Powered by blists - more mailing lists