On Mon, Sep 7, 2020 at 4:59 AM Jianqun Xu <[email protected]> wrote:

> These patches will fix some issues and modify for GKI.

I am sorry that responses and review is slow. The GKI thing is a bit
controversial leading to slowdowns in the community because it is
unclear how this should be dealt with in some cases.

> Heiko Stuebner (1):
> pinctrl: rockchip: depend on OF

I already applied this patch separately.

> Jianqun Xu (4):
> pinctrl: rockchip: make driver be tristate module
> pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq
> pinctrl: rockchip: create irq mapping in gpio_to_irq
> pinctrl: rockchip: populate platform device for rockchip gpio

Why have the big series of 13 patches from july been cut down to this?

I would prefer the "big" fix I even tried applying the old (13 patches)
series but it didn't work :(

We can apply this once they are reviewed, but I'd like the rest of the
13 patches as well I think.

Yours,
Linus Walleij

2020-09-20 22:43:23

by Heiko Stübner

[permalink] [raw]

Subject: Re: [PATCH] pinctrl: rockchip: populate platform device for rockchip gpio

Am Dienstag, 8. September 2020, 04:19:13 CEST schrieb Jianqun Xu:
> Register both gpio driver and device as part of driver model, so that
> the '-gpio'/'-gpios' dependency in dts can be correctly handled by
> of_devlink/of_fwlink.
>
> Signed-off-by: Jianqun Xu <[email protected]>

Reviewed-by: Heiko Stuebner <[email protected]>

> ---
> drivers/pinctrl/pinctrl-rockchip.c | 305 +++++++++++++++++------------
> 1 file changed, 175 insertions(+), 130 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
> index c98bd352f831..2e4fc711d0d1 100644
> --- a/drivers/pinctrl/pinctrl-rockchip.c
> +++ b/drivers/pinctrl/pinctrl-rockchip.c
> @@ -3370,139 +3370,121 @@ static void rockchip_irq_disable(struct irq_data *d)
> }
>
> static int rockchip_interrupts_register(struct platform_device *pdev,
> - struct rockchip_pinctrl *info)
> + struct rockchip_pin_bank *bank)
> {
> - struct rockchip_pin_ctrl *ctrl = info->ctrl;
> - struct rockchip_pin_bank *bank = ctrl->pin_banks;
> unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
> struct irq_chip_generic *gc;
> int ret;
> - int i;
>
> - for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {
> - if (!bank->valid) {
> - dev_warn(&pdev->dev, "bank %s is not valid\n",
> - bank->name);
> - continue;
> - }
> + if (!bank->valid) {
> + dev_warn(&pdev->dev, "bank %s is not valid\n",
> + bank->name);
> + return -EINVAL;
> + }
>
> - ret = clk_enable(bank->clk);
> - if (ret) {
> - dev_err(&pdev->dev, "failed to enable clock for bank %s\n",
> - bank->name);
> - continue;
> - }
> + ret = clk_enable(bank->clk);
> + if (ret) {
> + dev_err(&pdev->dev, "failed to enable clock for bank %s\n",
> + bank->name);
> + return ret;
> + }
>
> - bank->domain = irq_domain_add_linear(bank->of_node, 32,
> - &irq_generic_chip_ops, NULL);
> - if (!bank->domain) {
> - dev_warn(&pdev->dev, "could not initialize irq domain for bank %s\n",
> - bank->name);
> - clk_disable(bank->clk);
> - continue;
> - }
> + bank->domain = irq_domain_add_linear(bank->of_node, 32,
> + &irq_generic_chip_ops, NULL);
> + if (!bank->domain) {
> + dev_warn(&pdev->dev, "could not initialize irq domain for bank %s\n",
> + bank->name);
> + clk_disable(bank->clk);
> + return -EINVAL;
> + }
>
> - ret = irq_alloc_domain_generic_chips(bank->domain, 32, 1,
> - "rockchip_gpio_irq", handle_level_irq,
> - clr, 0, 0);
> - if (ret) {
> - dev_err(&pdev->dev, "could not alloc generic chips for bank %s\n",
> - bank->name);
> - irq_domain_remove(bank->domain);
> - clk_disable(bank->clk);
> - continue;
> - }
> + ret = irq_alloc_domain_generic_chips(bank->domain, 32, 1,
> + "rockchip_gpio_irq", handle_level_irq,
> + clr, 0, 0);
> + if (ret) {
> + dev_err(&pdev->dev, "could not alloc generic chips for bank %s\n",
> + bank->name);
> + irq_domain_remove(bank->domain);
> + clk_disable(bank->clk);
> + return ret;
> + }
>
> - gc = irq_get_domain_generic_chip(bank->domain, 0);
> - gc->reg_base = bank->reg_base;
> - gc->private = bank;
> - gc->chip_types[0].regs.mask = GPIO_INTMASK;
> - gc->chip_types[0].regs.ack = GPIO_PORTS_EOI;
> - gc->chip_types[0].chip.irq_ack = irq_gc_ack_set_bit;
> - gc->chip_types[0].chip.irq_mask = irq_gc_mask_set_bit;
> - gc->chip_types[0].chip.irq_unmask = irq_gc_mask_clr_bit;
> - gc->chip_types[0].chip.irq_enable = rockchip_irq_enable;
> - gc->chip_types[0].chip.irq_disable = rockchip_irq_disable;
> - gc->chip_types[0].chip.irq_set_wake = irq_gc_set_wake;
> - gc->chip_types[0].chip.irq_suspend = rockchip_irq_suspend;
> - gc->chip_types[0].chip.irq_resume = rockchip_irq_resume;
> - gc->chip_types[0].chip.irq_set_type = rockchip_irq_set_type;
> - gc->wake_enabled = IRQ_MSK(bank->nr_pins);
> + gc = irq_get_domain_generic_chip(bank->domain, 0);
> + gc->reg_base = bank->reg_base;
> + gc->private = bank;
> + gc->chip_types[0].regs.mask = GPIO_INTMASK;
> + gc->chip_types[0].regs.ack = GPIO_PORTS_EOI;
> + gc->chip_types[0].chip.irq_ack = irq_gc_ack_set_bit;
> + gc->chip_types[0].chip.irq_mask = irq_gc_mask_set_bit;
> + gc->chip_types[0].chip.irq_unmask = irq_gc_mask_clr_bit;
> + gc->chip_types[0].chip.irq_enable = rockchip_irq_enable;
> + gc->chip_types[0].chip.irq_disable = rockchip_irq_disable;
> + gc->chip_types[0].chip.irq_set_wake = irq_gc_set_wake;
> + gc->chip_types[0].chip.irq_suspend = rockchip_irq_suspend;
> + gc->chip_types[0].chip.irq_resume = rockchip_irq_resume;
> + gc->chip_types[0].chip.irq_set_type = rockchip_irq_set_type;
> + gc->wake_enabled = IRQ_MSK(bank->nr_pins);
>
> - /*
> - * Linux assumes that all interrupts start out disabled/masked.
> - * Our driver only uses the concept of masked and always keeps
> - * things enabled, so for us that's all masked and all enabled.
> - */
> - writel_relaxed(0xffffffff, bank->reg_base + GPIO_INTMASK);
> - writel_relaxed(0xffffffff, bank->reg_base + GPIO_INTEN);
> - gc->mask_cache = 0xffffffff;
> + /*
> + * Linux assumes that all interrupts start out disabled/masked.
> + * Our driver only uses the concept of masked and always keeps
> + * things enabled, so for us that's all masked and all enabled.
> + */
> + writel_relaxed(0xffffffff, bank->reg_base + GPIO_INTMASK);
> + writel_relaxed(0xffffffff, bank->reg_base + GPIO_INTEN);
> + gc->mask_cache = 0xffffffff;
>
> - irq_set_chained_handler_and_data(bank->irq,
> - rockchip_irq_demux, bank);
> - clk_disable(bank->clk);
> - }
> + irq_set_chained_handler_and_data(bank->irq,
> + rockchip_irq_demux, bank);
> + clk_disable(bank->clk);
>
> return 0;
> }
>
> static int rockchip_gpiolib_register(struct platform_device *pdev,
> - struct rockchip_pinctrl *info)
> + struct rockchip_pin_bank *bank)
> {
> - struct rockchip_pin_ctrl *ctrl = info->ctrl;
> - struct rockchip_pin_bank *bank = ctrl->pin_banks;
> struct gpio_chip *gc;
> int ret;
> - int i;
>
> - for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {
> - if (!bank->valid) {
> - dev_warn(&pdev->dev, "bank %s is not valid\n",
> - bank->name);
> - continue;
> - }
> + if (!bank->valid) {
> + dev_err(&pdev->dev, "bank %s is not valid\n", bank->name);
> + return -EINVAL;
> + }
>
> - bank->gpio_chip = rockchip_gpiolib_chip;
> + bank->gpio_chip = rockchip_gpiolib_chip;
>
> - gc = &bank->gpio_chip;
> - gc->base = bank->pin_base;
> - gc->ngpio = bank->nr_pins;
> - gc->parent = &pdev->dev;
> - gc->of_node = bank->of_node;
> - gc->label = bank->name;
> + gc = &bank->gpio_chip;
> + gc->base = bank->pin_base;
> + gc->ngpio = bank->nr_pins;
> + gc->parent = &pdev->dev;
> + gc->of_node = bank->of_node;
> + gc->label = bank->name;
>
> - ret = gpiochip_add_data(gc, bank);
> - if (ret) {
> - dev_err(&pdev->dev, "failed to register gpio_chip %s, error code: %d\n",
> - gc->label, ret);
> - goto fail;
> - }
> + ret = gpiochip_add_data(gc, bank);
> + if (ret) {
> + dev_err(&pdev->dev, "failed to register %s (%d)\n", gc->label, ret);
> + return ret;
> }
>
> - rockchip_interrupts_register(pdev, info);
> + if (!of_property_read_bool(bank->of_node, "gpio-ranges")) {
> + struct device *parent = pdev->dev.parent;
> + struct rockchip_pinctrl *info = dev_get_drvdata(parent);
> + struct pinctrl_dev *pctldev;
>
> - return 0;
> + if (!info)
> + return -ENODATA;
>
> -fail:
> - for (--i, --bank; i >= 0; --i, --bank) {
> - if (!bank->valid)
> - continue;
> - gpiochip_remove(&bank->gpio_chip);
> - }
> - return ret;
> -}
> -
> -static int rockchip_gpiolib_unregister(struct platform_device *pdev,
> - struct rockchip_pinctrl *info)
> -{
> - struct rockchip_pin_ctrl *ctrl = info->ctrl;
> - struct rockchip_pin_bank *bank = ctrl->pin_banks;
> - int i;
> + pctldev = info->pctl_dev;
> + if (!pctldev)
> + return -ENODEV;
>
> - for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {
> - if (!bank->valid)
> - continue;
> - gpiochip_remove(&bank->gpio_chip);
> + ret = gpiochip_add_pin_range(gc, dev_name(pctldev->dev), 0, gc->base, gc->ngpio);
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to add pin range\n");
> + gpiochip_remove(&bank->gpio_chip);
> + return ret;
> + }
> }
>
> return 0;
> @@ -3571,7 +3553,6 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data(
> {
> const struct of_device_id *match;
> struct device_node *node = pdev->dev.of_node;
> - struct device_node *np;
> struct rockchip_pin_ctrl *ctrl;
> struct rockchip_pin_bank *bank;
> int grf_offs, pmu_offs, drv_grf_offs, drv_pmu_offs, i, j;
> @@ -3579,23 +3560,6 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data(
> match = of_match_node(rockchip_pinctrl_dt_match, node);
> ctrl = (struct rockchip_pin_ctrl *)match->data;
>
> - for_each_child_of_node(node, np) {
> - if (!of_find_property(np, "gpio-controller", NULL))
> - continue;
> -
> - bank = ctrl->pin_banks;
> - for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {
> - if (!strcmp(bank->name, np->name)) {
> - bank->of_node = np;
> -
> - if (!rockchip_get_bank_data(bank, d))
> - bank->valid = true;
> -
> - break;
> - }
> - }
> - }
> -
> grf_offs = ctrl->grf_mux_offset;
> pmu_offs = ctrl->pmu_mux_offset;
> drv_pmu_offs = ctrl->pmu_drv_offset;
> @@ -3742,6 +3706,68 @@ static int __maybe_unused rockchip_pinctrl_resume(struct device *dev)
> static SIMPLE_DEV_PM_OPS(rockchip_pinctrl_dev_pm_ops, rockchip_pinctrl_suspend,
> rockchip_pinctrl_resume);
>
> +static int rockchip_gpio_probe(struct platform_device *pdev)
> +{
> + struct device_node *np = pdev->dev.of_node;
> + struct device *parent = pdev->dev.parent;
> + struct rockchip_pinctrl *info = dev_get_drvdata(parent);
> + struct rockchip_pin_ctrl *ctrl = info ? (info->ctrl) : NULL;
> + struct rockchip_pin_bank *bank;
> + int ret, i;
> +
> + if (!info || !ctrl)
> + return -EINVAL;
> +
> + if (!of_find_property(np, "gpio-controller", NULL))
> + return -ENODEV;
> +
> + bank = ctrl->pin_banks;
> + for (i = 0; i < ctrl->nr_banks; ++i, ++bank) {
> + if (!strcmp(bank->name, np->name)) {
> + bank->of_node = np;
> +
> + if (!rockchip_get_bank_data(bank, info))
> + bank->valid = true;
> +
> + break;
> + }
> + }
> +
> + if (!bank->valid) {
> + dev_info(parent, "gpio%d probed\n", bank->bank_num);
> + return -EINVAL;
> + }
> +
> + bank->of_node = pdev->dev.of_node;
> +
> + ret = rockchip_gpiolib_register(pdev, bank);
> + if (ret)
> + return ret;
> +
> + ret = rockchip_interrupts_register(pdev, bank);
> + if (ret) {
> + gpiochip_remove(&bank->gpio_chip);
> + return ret;
> + }
> +
> + platform_set_drvdata(pdev, bank);
> + dev_info(parent, "gpio%d probed\n", bank->bank_num);
> +
> + return 0;
> +}
> +
> +static int rockchip_gpio_remove(struct platform_device *pdev)
> +{
> + struct rockchip_pin_bank *bank = platform_get_drvdata(pdev);
> +
> + if (!bank)
> + return -EINVAL;
> +
> + gpiochip_remove(&bank->gpio_chip);
> +
> + return 0;
> +}
> +
> static int rockchip_pinctrl_probe(struct platform_device *pdev)
> {
> struct rockchip_pinctrl *info;
> @@ -3813,17 +3839,20 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
> return PTR_ERR(info->regmap_pmu);
> }
>
> - ret = rockchip_gpiolib_register(pdev, info);
> - if (ret)
> - return ret;
> -
> ret = rockchip_pinctrl_register(pdev, info);
> if (ret) {
> - rockchip_gpiolib_unregister(pdev, info);
> + dev_err(&pdev->dev, "failed to register pinctrl device\n");
> return ret;
> }
>
> platform_set_drvdata(pdev, info);
> + dev_info(&pdev->dev, "pinctrl probed\n");
> +
> + ret = of_platform_populate(np, rockchip_bank_match, NULL, dev);
> + if (ret) {
> + dev_err(&pdev->dev, "failed to register gpio device\n");
> + return ret;
> + }
>
> return 0;
> }
> @@ -4244,8 +4273,17 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = {
> {},
> };
>
> +static struct platform_driver rockchip_gpio_driver = {
> + .probe = rockchip_gpio_probe,
> + .remove = rockchip_gpio_remove,
> + .driver = {
> + .name = "rockchip-gpio",
> + .of_match_table = rockchip_bank_match,
> + },
> +};
> +
> static struct platform_driver rockchip_pinctrl_driver = {
> - .probe = rockchip_pinctrl_probe,
> + .probe = rockchip_pinctrl_probe,
> .driver = {
> .name = "rockchip-pinctrl",
> .pm = &rockchip_pinctrl_dev_pm_ops,
> @@ -4255,11 +4293,18 @@ static struct platform_driver rockchip_pinctrl_driver = {
>
> static int __init rockchip_pinctrl_drv_register(void)
> {
> - return platform_driver_register(&rockchip_pinctrl_driver);
> + int ret;
> +
> + ret = platform_driver_register(&rockchip_pinctrl_driver);
> + if (ret)
> + return ret;
> +
> + return platform_driver_register(&rockchip_gpio_driver);
> }
>
> static void __exit rockchip_pinctrl_drv_unregister(void)
> {
> + platform_driver_unregister(&rockchip_gpio_driver);
> platform_driver_unregister(&rockchip_pinctrl_driver);
> }
>
>