Re: [PATCH v4 1/2] pinctrl: make MediaTek pinctrl v2 driver ready for buidling loadable module

From: Light Hsieh
Date: Tue Mar 17 2020 - 05:28:24 EST

Next message: Light Hsieh: "Re: [PATCH v4 2/2] pinctrl: make MediaTek MT6765 pinctrl ready for buidling loadable module"
Previous message: Thomas Gleixner: "Re: [RFC][PATCH 00/16] objtool: vmlinux.o and noinstr validation"
Next in thread: Sean Wang: "Re: [PATCH v4 1/2] pinctrl: make MediaTek pinctrl v2 driver ready for buidling loadable module"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Sun, 2020-03-15 at 14:35 -0700, Sean Wang wrote:
> Hi, Light
>
> On Tue, Mar 10, 2020 at 12:39 AM <light.hsieh@xxxxxxxxxxxx> wrote:
> >
> > From: Light Hsieh <light.hsieh@xxxxxxxxxxxx>
> >
>
> Correct the prefix of the subject with "pinctrl: mediatek".
>
> > In the future we want to be able to build the MediaTek pinctrl driver,
> > based on paris, as kernel module. This patch allows pinctrl-paris.c, the
> > external interrupt controller mtk-eint.c, and pinctrl-mtk-common-v2.c to
> > be loadable as module.
> >
> > Signed-off-by: Light Hsieh <light.hsieh@xxxxxxxxxxxx>
> > Reviewed-by: Matthias Brugger <matthias.bgg@xxxxxxxxx>
> > ---
> > drivers/pinctrl/mediatek/Kconfig | 13 +++++++++++--
> > drivers/pinctrl/mediatek/Makefile | 5 +++--
> > drivers/pinctrl/mediatek/mtk-eint.c | 9 +++++++++
> > drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 24 ++++++++++++++++++++++++
> > drivers/pinctrl/mediatek/pinctrl-paris.c | 6 ++++++
> > drivers/pinctrl/pinconf-generic.c | 1 +
>
> Separate the patches for the device driver and for the core respectively.

Since the patch for pinconf-generic.c had been done in b88d145191ad
("pinctrl: Export some needed symbols at module load time").
I will remove patch for pinconf-generic.c.

> > 6 files changed, 54 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
> > index 701f9af..4cd1109 100644
> > --- a/drivers/pinctrl/mediatek/Kconfig
> > +++ b/drivers/pinctrl/mediatek/Kconfig
> > @@ -3,10 +3,12 @@ menu "MediaTek pinctrl drivers"
> > depends on ARCH_MEDIATEK || COMPILE_TEST
> >
> > config EINT_MTK
> > - bool "MediaTek External Interrupt Support"
> > + tristate "MediaTek External Interrupt Support"
> > depends on PINCTRL_MTK || PINCTRL_MTK_MOORE || PINCTRL_MTK_PARIS || COMPILE_TEST
> > select GPIOLIB
> > select IRQ_DOMAIN
> > + default y if PINCTRL_MTK || PINCTRL_MTK_MOORE
> > + default PINCTRL_MTK_PARIS
> >
> > config PINCTRL_MTK
> > bool
> > @@ -17,23 +19,30 @@ config PINCTRL_MTK
> > select EINT_MTK
> > select OF_GPIO
> >
> > +config PINCTRL_MTK_V2
> > + tristate
> > + depends on PINCTRL_MTK_MOORE || PINCTRL_MTK_PARIS
>
> PINCTRL_MTK_V2 doesn't have to depend on PINCTRL_MTK_MOORE or
> PINCTRL_MTK_PARIS to work and it can build on it own so that lets us
> remove the dependency.
>
The usage of PINCTRL_MTK had been describe in cover letter:

1.4 PINCTRL_MTK_V2: add this tristate config which depends on
PINCTRL_MTK_PARIS and PINCTRL_MTK_MOORE. No need to specify in
defconfig file.
* PINCTRL_MTK_V2 will be y if either PINCTRL_MTK_PARIS or
PINCTRL_MTK_MOORE is y.
* PINCTRL_MTK_V2 will be n if both PINCTRL_MTK_PARIS and
PINCTRL_MTK_MOORE are n.
* PINCTRL_MTK_V2 will be m if PINCTRL_MTK_PARIS is m and
PINCTRL_MTK_MOORE is n.

Without PINCTRL_MTK_V2, we cannot specify whether
pinctrl-mtk-common-v2.c is built-in or loadable kernel module.

> > +
> > config PINCTRL_MTK_MOORE
> > bool
> > depends on OF
> > select GENERIC_PINCONF
> > select GENERIC_PINCTRL_GROUPS
> > select GENERIC_PINMUX_FUNCTIONS
> > + select EINT_MTK
>
> The original design of PINCTRL_MTK_MOORE doesn't have to work with
> EINT_MTK coupled tightly so that let us remove the reverse dependency.
>

Actually, PINCTRL_MTK_MOORE use EINT_MTK in the following call flow:
mtk_moore_pinctrl_probe() -> mtk_build_eint() -> mtk_eint_do_init().
mtk_eint_do_init() is defined in mtk-eint.c.

> > select GPIOLIB
> > select OF_GPIO
> > + select PINCTRL_MTK_V2
> >
> > config PINCTRL_MTK_PARIS
> > - bool
> > + tristate
> > depends on OF
> > select PINMUX
> > select GENERIC_PINCONF
> > select GPIOLIB
> > select EINT_MTK
> > select OF_GPIO
> > + select PINCTRL_MTK_V2
> >
> > # For ARMv7 SoCs
> > config PINCTRL_MT2701
> > diff --git a/drivers/pinctrl/mediatek/Makefile b/drivers/pinctrl/mediatek/Makefile
> > index a74325a..4b71328 100644
> > --- a/drivers/pinctrl/mediatek/Makefile
> > +++ b/drivers/pinctrl/mediatek/Makefile
> > @@ -2,8 +2,9 @@
> > # Core
> > obj-$(CONFIG_EINT_MTK) += mtk-eint.o
> > obj-$(CONFIG_PINCTRL_MTK) += pinctrl-mtk-common.o
> > -obj-$(CONFIG_PINCTRL_MTK_MOORE) += pinctrl-moore.o pinctrl-mtk-common-v2.o
> > -obj-$(CONFIG_PINCTRL_MTK_PARIS) += pinctrl-paris.o pinctrl-mtk-common-v2.o
> > +obj-$(CONFIG_PINCTRL_MTK_V2) += pinctrl-mtk-common-v2.o
> > +obj-$(CONFIG_PINCTRL_MTK_MOORE) += pinctrl-moore.o
> > +obj-$(CONFIG_PINCTRL_MTK_PARIS) += pinctrl-paris.o
> >
> > # SoC Drivers
> > obj-$(CONFIG_PINCTRL_MT2701) += pinctrl-mt2701.o
> > diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c
> > index 7e526bcf..99703a8 100644
> > --- a/drivers/pinctrl/mediatek/mtk-eint.c
> > +++ b/drivers/pinctrl/mediatek/mtk-eint.c
> > @@ -9,6 +9,7 @@
> > *
> > */
> >
> > +#include <linux/module.h>
>
> Sort in alphabetical order, please.
>

OK.

> > #include <linux/delay.h>
> > #include <linux/err.h>
> > #include <linux/gpio/driver.h>
> > @@ -379,6 +380,7 @@ int mtk_eint_do_suspend(struct mtk_eint *eint)
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_eint_do_suspend);
> >
> > int mtk_eint_do_resume(struct mtk_eint *eint)
> > {
> > @@ -386,6 +388,7 @@ int mtk_eint_do_resume(struct mtk_eint *eint)
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_eint_do_resume);
> >
> > int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num,
> > unsigned int debounce)
> > @@ -440,6 +443,7 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_eint_set_debounce);
> >
> > int mtk_eint_find_irq(struct mtk_eint *eint, unsigned long eint_n)
> > {
> > @@ -451,6 +455,7 @@ int mtk_eint_find_irq(struct mtk_eint *eint, unsigned long eint_n)
> >
> > return irq;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_eint_find_irq);
> >
> > int mtk_eint_do_init(struct mtk_eint *eint)
> > {
> > @@ -495,3 +500,7 @@ int mtk_eint_do_init(struct mtk_eint *eint)
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_eint_do_init);
> > +
> > +MODULE_LICENSE("GPL v2");
> > +MODULE_DESCRIPTION("MediaTek EINT Driver");
> > diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
> > index 1da9425..cdf2d69 100644
> > --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
> > +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
> > @@ -6,6 +6,7 @@
> > *
> > */
> >
> > +#include <linux/module.h>
>
> Sort in alphabetical order, please.

OK.

>
> > #include <dt-bindings/pinctrl/mt65xx.h>
> > #include <linux/device.h>
> > #include <linux/err.h>
> > @@ -206,6 +207,7 @@ int mtk_hw_set_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_hw_set_value);
> >
> > int mtk_hw_get_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc,
> > int field, int *value)
> > @@ -225,6 +227,7 @@ int mtk_hw_get_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_hw_get_value);
> >
> > static int mtk_xt_find_eint_num(struct mtk_pinctrl *hw, unsigned long eint_n)
> > {
> > @@ -363,6 +366,7 @@ int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev)
> >
> > return mtk_eint_do_init(hw->eint);
> > }
> > +EXPORT_SYMBOL_GPL(mtk_build_eint);
> >
> > /* Revision 0 */
> > int mtk_pinconf_bias_disable_set(struct mtk_pinctrl *hw,
> > @@ -382,6 +386,7 @@ int mtk_pinconf_bias_disable_set(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_disable_set);
> >
> > int mtk_pinconf_bias_disable_get(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, int *res)
> > @@ -404,6 +409,7 @@ int mtk_pinconf_bias_disable_get(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_disable_get);
> >
> > int mtk_pinconf_bias_set(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, bool pullup)
> > @@ -423,6 +429,7 @@ int mtk_pinconf_bias_set(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_set);
> >
> > int mtk_pinconf_bias_get(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, bool pullup, int *res)
> > @@ -442,6 +449,7 @@ int mtk_pinconf_bias_get(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_get);
> >
> > /* Revision 1 */
> > int mtk_pinconf_bias_disable_set_rev1(struct mtk_pinctrl *hw,
> > @@ -456,6 +464,7 @@ int mtk_pinconf_bias_disable_set_rev1(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_disable_set_rev1);
> >
> > int mtk_pinconf_bias_disable_get_rev1(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, int *res)
> > @@ -473,6 +482,7 @@ int mtk_pinconf_bias_disable_get_rev1(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_disable_get_rev1);
> >
> > int mtk_pinconf_bias_set_rev1(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, bool pullup)
> > @@ -492,6 +502,7 @@ int mtk_pinconf_bias_set_rev1(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_set_rev1);
> >
> > int mtk_pinconf_bias_get_rev1(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, bool pullup,
> > @@ -517,6 +528,7 @@ int mtk_pinconf_bias_get_rev1(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_set_gev1);
>
> That should be EXPORT_SYMBOL_GPL(mtk_pinconf_bias_get_rev1);
>

OK.

> >
> > /* Combo for the following pull register type:
> > * 1. PU + PD
> > @@ -717,6 +729,7 @@ int mtk_pinconf_bias_set_combo(struct mtk_pinctrl *hw,
> > out:
> > return err;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_set_combo);
> >
> > int mtk_pinconf_bias_get_combo(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc,
> > @@ -737,6 +750,7 @@ int mtk_pinconf_bias_get_combo(struct mtk_pinctrl *hw,
> > out:
> > return err;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_bias_get_combo);
> >
> > /* Revision 0 */
> > int mtk_pinconf_drive_set(struct mtk_pinctrl *hw,
> > @@ -766,6 +780,7 @@ int mtk_pinconf_drive_set(struct mtk_pinctrl *hw,
> >
> > return err;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_drive_set);
> >
> > int mtk_pinconf_drive_get(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, int *val)
> > @@ -790,6 +805,7 @@ int mtk_pinconf_drive_get(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_drive_get);
> >
> > /* Revision 1 */
> > int mtk_pinconf_drive_set_rev1(struct mtk_pinctrl *hw,
> > @@ -811,6 +827,7 @@ int mtk_pinconf_drive_set_rev1(struct mtk_pinctrl *hw,
> >
> > return err;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_drive_set_rev1);
> >
> > int mtk_pinconf_drive_get_rev1(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, int *val)
> > @@ -828,18 +845,21 @@ int mtk_pinconf_drive_get_rev1(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_drive_get_rev1);
> >
> > int mtk_pinconf_drive_set_raw(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, u32 arg)
> > {
> > return mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DRV, arg);
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_drive_set_raw);
> >
> > int mtk_pinconf_drive_get_raw(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, int *val)
> > {
> > return mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DRV, val);
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_drive_get_raw);
> >
> > int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, bool pullup,
> > @@ -880,6 +900,7 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw,
> >
> > return err;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_adv_pull_set);
> >
> > int mtk_pinconf_adv_pull_get(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, bool pullup,
> > @@ -922,6 +943,7 @@ int mtk_pinconf_adv_pull_get(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_adv_pull_get);
> >
> > int mtk_pinconf_adv_drive_set(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, u32 arg)
> > @@ -948,6 +970,7 @@ int mtk_pinconf_adv_drive_set(struct mtk_pinctrl *hw,
> >
> > return err;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_adv_drive_set);
> >
> > int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw,
> > const struct mtk_pin_desc *desc, u32 *val)
> > @@ -971,3 +994,4 @@ int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw,
> >
> > return 0;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pinconf_adv_drive_get);
> > diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
> > index 83bf29c..028a3de 100644
> > --- a/drivers/pinctrl/mediatek/pinctrl-paris.c
> > +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
> > @@ -9,6 +9,7 @@
> > * Hongzhou.Yang <hongzhou.yang@xxxxxxxxxxxx>
> > */
> >
> > +#include <linux/module.h>
>
> Sort in alphabetical order, please.
>

OK.

> > #include <linux/gpio/driver.h>
> > #include <dt-bindings/pinctrl/mt65xx.h>
> > #include "pinctrl-paris.h"
> > @@ -633,6 +634,7 @@ ssize_t mtk_pctrl_show_one_pin(struct mtk_pinctrl *hw,
> >
> > return len;
> > }
> > +EXPORT_SYMBOL_GPL(mtk_pctrl_show_one_pin);
> >
> > #define PIN_DBG_BUF_SZ 96
> > static void mtk_pctrl_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s,
> > @@ -1037,3 +1039,7 @@ static int mtk_paris_pinctrl_resume(struct device *device)
> > .suspend_noirq = mtk_paris_pinctrl_suspend,
> > .resume_noirq = mtk_paris_pinctrl_resume,
> > };
> > +EXPORT_SYMBOL_GPL(mtk_paris_pinctrl_probe);
> > +
> > +MODULE_LICENSE("GPL v2");
> > +MODULE_DESCRIPTION("MediaTek Pinctrl Common Driver V2 Paris");
> > diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
> > index 9eb8630..dfef471 100644
> > --- a/drivers/pinctrl/pinconf-generic.c
> > +++ b/drivers/pinctrl/pinconf-generic.c
> > @@ -286,6 +286,7 @@ int pinconf_generic_parse_dt_config(struct device_node *np,
> > kfree(cfg);
> > return ret;
> > }
> > +EXPORT_SYMBOL_GPL(pinconf_generic_parse_dt_config);
> >
>
> The change probably has been done in b88d145191ad ("pinctrl: Export
> some needed symbols at module load time").
>

OK. I will remove patch for pinconf-generic.c

> > int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
> > struct device_node *np, struct pinctrl_map **map,
> > --
> > 1.8.1.1.dirty

Next message: Light Hsieh: "Re: [PATCH v4 2/2] pinctrl: make MediaTek MT6765 pinctrl ready for buidling loadable module"
Previous message: Thomas Gleixner: "Re: [RFC][PATCH 00/16] objtool: vmlinux.o and noinstr validation"
Next in thread: Sean Wang: "Re: [PATCH v4 1/2] pinctrl: make MediaTek pinctrl v2 driver ready for buidling loadable module"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]