| 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: Tue, 5 Nov 2019 10:39:04 +0800
From: Qianggui Song <qianggui.song@...ogic.com>
To: Jerome Brunet <jbrunet@...libre.com>,
Linus Walleij <linus.walleij@...aro.org>,
<linux-gpio@...r.kernel.org>
CC: Neil Armstrong <narmstrong@...libre.com>,
Kevin Hilman <khilman@...libre.com>,
Martin Blumenstingl <martin.blumenstingl@...glemail.com>,
Carlo Caione <carlo@...one.org>,
Rob Herring <robh+dt@...nel.org>,
Xingyu Chen <xingyu.chen@...ogic.com>,
Jianxin Pan <jianxin.pan@...ogic.com>,
Hanjie Lin <hanjie.lin@...ogic.com>,
Mark Rutland <mark.rutland@....com>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-amlogic@...ts.infradead.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v4 2/4] pinctrl: meson: add a new callback for SoCs fixup
On 2019/11/4 15:59, Jerome Brunet wrote:
>
> On Fri 25 Oct 2019 at 13:49, Qianggui Song <qianggui.song@...ogic.com> wrote:
>
>> In meson_pinctrl_parse_dt, it contains two parts: reg parsing and
>> SoC relative fixup for AO. Several fixups in the same code make it hard
>> to maintain, so move all fixups to each SoC's callback and make
>> meson_pinctrl_parse_dt just do the reg parsing, separate these two
>> parts.Overview of all current Meson SoCs fixup is as below:
>>
>> +------+--------------------------------------+--------------------------+
>> | | | |
>> | SoC | EE domain | AO domain |
>> +------+--------------------------------------+--------------------------+
>> |m8 | parse regs: | parse regs: |
>> |m8b | gpio,mux,pull,pull-enable(skip ds) | gpio,mux,pull(skip ds)|
>> |gxl | fixup: | fixup: |
>> |gxbb | no | pull-enable = pull |
>> |axg | | |
>> +------+--------------------------------------+--------------------------+
>> |g12a | parse regs: | parse regs: |
>> |sm1 | gpio,mux,pull,pull-enable,ds | gpio,mux,ds |
>> | | fixup: | fixup: |
>> | | no | pull = gpio |
>> | | | pull-enable = gpio |
>> +------+--------------------------------------+--------------------------+
>> |a1 or | parse regs: |
>> |later | gpio/mux (without ao domain) |
>> |SoCs | fixup: |
>> | | pull=gpio; pull-enable=gpio; ds=gpio |
>> +------+-----------------------------------------------------------------+
>>
>> Signed-off-by: Qianggui Song <qianggui.song@...ogic.com>
>> ---
>> drivers/pinctrl/meson/pinctrl-meson-axg.c | 11 +++++++++++
>> drivers/pinctrl/meson/pinctrl-meson-g12a.c | 9 +++++++++
>> drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 11 +++++++++++
>> drivers/pinctrl/meson/pinctrl-meson-gxl.c | 11 +++++++++++
>> drivers/pinctrl/meson/pinctrl-meson.c | 9 +++++----
>> drivers/pinctrl/meson/pinctrl-meson.h | 3 +++
>> drivers/pinctrl/meson/pinctrl-meson8.c | 11 +++++++++++
>> drivers/pinctrl/meson/pinctrl-meson8b.c | 11 +++++++++++
>> 8 files changed, 72 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
>> index ad502eda4afa..9c07f4423c37 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
>> @@ -1040,6 +1040,16 @@
>> .num_pmx_banks = ARRAY_SIZE(meson_axg_aobus_pmx_banks),
>> };
>>
>> +static int meson_axg_aobus_parse_dt_extra(struct meson_pinctrl *pc)
>> +{
>> + if (!pc->reg_pull)
>> + return -EINVAL;
>> +
>> + pc->reg_pullen = pc->reg_pull;
>> +
>> + return 0;
>> +}
>> +
>> static struct meson_pinctrl_data meson_axg_periphs_pinctrl_data = {
>> .name = "periphs-banks",
>> .pins = meson_axg_periphs_pins,
>> @@ -1066,6 +1076,7 @@
>> .num_banks = ARRAY_SIZE(meson_axg_aobus_banks),
>> .pmx_ops = &meson_axg_pmx_ops,
>> .pmx_data = &meson_axg_aobus_pmx_banks_data,
>> + .parse_dt = meson_axg_aobus_parse_dt_extra,
>> };
>>
>> static const struct of_device_id meson_axg_pinctrl_dt_match[] = {
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
>> index 582665fd362a..41850e3c0091 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
>> @@ -1362,6 +1362,14 @@
>> .num_pmx_banks = ARRAY_SIZE(meson_g12a_aobus_pmx_banks),
>> };
>>
>> +static int meson_g12a_aobus_parse_dt_extra(struct meson_pinctrl *pc)
>> +{
>> + pc->reg_pull = pc->reg_gpio;
>> + pc->reg_pullen = pc->reg_gpio;
>> +
>> + return 0;
>> +}
>> +
>> static struct meson_pinctrl_data meson_g12a_periphs_pinctrl_data = {
>> .name = "periphs-banks",
>> .pins = meson_g12a_periphs_pins,
>> @@ -1388,6 +1396,7 @@
>> .num_banks = ARRAY_SIZE(meson_g12a_aobus_banks),
>> .pmx_ops = &meson_axg_pmx_ops,
>> .pmx_data = &meson_g12a_aobus_pmx_banks_data,
>> + .parse_dt = meson_g12a_aobus_parse_dt_extra,
>> };
>>
>> static const struct of_device_id meson_g12a_pinctrl_dt_match[] = {
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
>> index 5bfa56f3847e..f5494a948200 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
>> @@ -827,6 +827,16 @@
>> BANK("AO", GPIOAO_0, GPIOAO_13, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0),
>> };
>>
>> +static int meson_gxbb_aobus_parse_dt_extra(struct meson_pinctrl *pc)
>> +{
>> + if (!pc->reg_pull)
>> + return -EINVAL;
>> +
>> + pc->reg_pullen = pc->reg_pull;
>> +
>> + return 0;
>> +}
>
> Can you share the definition of this function instead of repeating it ?
>
Seems like this common function can only be placed in pinctrl-meson.c, I
will try to write a meson_aobus_parse_dt_extra in pinctrl-meson.c and
assign it to each SoCs driver before g12a.
>> +
>> static struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
>> .name = "periphs-banks",
>> .pins = meson_gxbb_periphs_pins,
>> @@ -851,6 +861,7 @@
>> .num_funcs = ARRAY_SIZE(meson_gxbb_aobus_functions),
>> .num_banks = ARRAY_SIZE(meson_gxbb_aobus_banks),
>> .pmx_ops = &meson8_pmx_ops,
>> + .parse_dt = meson_gxbb_aobus_parse_dt_extra,
>> };
>>
>> static const struct of_device_id meson_gxbb_pinctrl_dt_match[] = {
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
>> index 72c5373c8dc1..943fb27dab08 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
>> @@ -796,6 +796,16 @@
>> BANK("AO", GPIOAO_0, GPIOAO_9, 0, 9, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0),
>> };
>>
>> +static int meson_gxl_aobus_parse_dt_extra(struct meson_pinctrl *pc)
>> +{
>> + if (!pc->reg_pull)
>> + return -EINVAL;
>> +
>> + pc->reg_pullen = pc->reg_pull;
>> +
>> + return 0;
>> +}
>
> Same
will do it for above and below other platform.
>
>> +
>> static struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
>> .name = "periphs-banks",
>> .pins = meson_gxl_periphs_pins,
>> @@ -820,6 +830,7 @@
>> .num_funcs = ARRAY_SIZE(meson_gxl_aobus_functions),
>> .num_banks = ARRAY_SIZE(meson_gxl_aobus_banks),
>> .pmx_ops = &meson8_pmx_ops,
>> + .parse_dt = meson_gxl_aobus_parse_dt_extra,
>> };
>>
>> static const struct of_device_id meson_gxl_pinctrl_dt_match[] = {
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
>> index 8bba9d053d9f..e182583422a4 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson.c
>> @@ -677,14 +677,12 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc,
>> }
>>
>> pc->reg_pull = meson_map_resource(pc, gpio_np, "pull");
>> - /* Use gpio region if pull one is not present */
>> if (IS_ERR(pc->reg_pull))
>> - pc->reg_pull = pc->reg_gpio;
>> + pc->reg_pull = NULL;
>
> Instead of doing this fixup, could modifhy meson_map_ressourse() to
> return NULL instead of -ENOENT ?
>
> Then you should IS_ERR_OR_NULL() for "mux" and "gpio" and just IS_ERR()
> for the rest
>
Ok, will modify this in the next patch set
>>
>> pc->reg_pullen = meson_map_resource(pc, gpio_np, "pull-enable");
>> - /* Use pull region if pull-enable one is not present */
>> if (IS_ERR(pc->reg_pullen))
>> - pc->reg_pullen = pc->reg_pull;
>> + pc->reg_pullen = NULL;
>>
>> pc->reg_ds = meson_map_resource(pc, gpio_np, "ds");
>> if (IS_ERR(pc->reg_ds)) {
>> @@ -692,6 +690,9 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc,
>> pc->reg_ds = NULL;
>> }
>>
>> + if (pc->data->parse_dt)
>> + return pc->data->parse_dt(pc);
>> +
>> return 0;
>> }
>>
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
>> index c696f3241a36..d570f7c53045 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson.h
>> +++ b/drivers/pinctrl/meson/pinctrl-meson.h
>> @@ -11,6 +11,8 @@
>> #include <linux/regmap.h>
>> #include <linux/types.h>
>>
>> +struct meson_pinctrl;
>> +
>> /**
>> * struct meson_pmx_group - a pinmux group
>> *
>> @@ -114,6 +116,7 @@ struct meson_pinctrl_data {
>> unsigned int num_banks;
>> const struct pinmux_ops *pmx_ops;
>> void *pmx_data;
>> + int (*parse_dt)(struct meson_pinctrl *pc);
>> };
>>
>> struct meson_pinctrl {
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c
>> index 0b97befa6335..65c70c9b7070 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson8.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson8.c
>> @@ -1079,6 +1079,16 @@
>> BANK("AO", GPIOAO_0, GPIO_TEST_N, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0),
>> };
>>
>> +static int meson8_aobus_parse_dt_extra(struct meson_pinctrl *pc)
>> +{
>> + if (!pc->reg_pull)
>> + return -EINVAL;
>> +
>> + pc->reg_pullen = pc->reg_pull;
>> +
>> + return 0;
>> +}
>> +
>> static struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
>> .name = "cbus-banks",
>> .pins = meson8_cbus_pins,
>> @@ -1103,6 +1113,7 @@
>> .num_funcs = ARRAY_SIZE(meson8_aobus_functions),
>> .num_banks = ARRAY_SIZE(meson8_aobus_banks),
>> .pmx_ops = &meson8_pmx_ops,
>> + .parse_dt = &meson8_aobus_parse_dt_extra,
>> };
>>
>> static const struct of_device_id meson8_pinctrl_dt_match[] = {
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
>> index a7de388388e6..85dc12e0c839 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson8b.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
>> @@ -938,6 +938,16 @@
>> BANK("AO", GPIOAO_0, GPIO_TEST_N, 0, 13, 0, 16, 0, 0, 0, 0, 0, 16, 1, 0),
>> };
>>
>> +static int meson8b_aobus_parse_dt_extra(struct meson_pinctrl *pc)
>> +{
>> + if (!pc->reg_pull)
>> + return -EINVAL;
>> +
>> + pc->reg_pullen = pc->reg_pull;
>> +
>> + return 0;
>> +}
>> +
>> static struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
>> .name = "cbus-banks",
>> .pins = meson8b_cbus_pins,
>> @@ -962,6 +972,7 @@
>> .num_funcs = ARRAY_SIZE(meson8b_aobus_functions),
>> .num_banks = ARRAY_SIZE(meson8b_aobus_banks),
>> .pmx_ops = &meson8_pmx_ops,
>> + .parse_dt = &meson8b_aobus_parse_dt_extra,
>> };
>>
>> static const struct of_device_id meson8b_pinctrl_dt_match[] = {
>
> .
>
Powered by blists - more mailing lists