gpio: Remove dynamic allocation from populate_parent_alloc_arg()
Subsystems (9)
PATCH 1/1 gpio: Remove dynamic allocation from populate_parent_alloc_arg()
The gpiolib is unique in the way it uses intermediate fwspecs when feeding an interrupt specifier to the parent domain, as it relies on the populate_parent_alloc_arg() callback to perform a dynamic allocation.
THis is pretty inefficient (we free the structure almost immediately), and the only reason this isn't a stack allocation is that our ThunderX friend uses MSIs rather than a FW-constructed structure.
Let's solve it by providing a new type composed of the union of a struct irq_fwspec and a msi_info_t, which satisfies both requirements. This allows us to use a stack allocation, and we can move the handful of users to this new scheme.
Also perform some additional cleanup, such as getting rid of the stub versions of the irq_domain_translate_*cell helpers, which are never used when CONFIG_IRQ_DOMAIN_HIERARCHY isn't selected.
Tested on a Tegra186.
--- drivers/gpio/gpio-msc313.c | 15 ++++----- drivers/gpio/gpio-tegra.c | 15 ++++----- drivers/gpio/gpio-tegra186.c | 15 ++++----- drivers/gpio/gpio-thunderx.c | 15 ++++----- drivers/gpio/gpio-visconti.c | 15 ++++----- drivers/gpio/gpiolib.c | 42 ++++++++++-------------- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 15 ++++----- include/linux/gpio/driver.h | 42 +++++++++++------------- 8 files changed, 73 insertions(+), 101 deletions(-)
drivers/gpio/gpio-msc313.c +6 -9
@@ -550,15 +550,12 @@ static struct irq_chip msc313_gpio_irqchip = {* so we need to provide the fwspec. Essentially gpiochip_populate_parent_fwspec_twocell * that puts GIC_SPI into the first cell. */ -static void *msc313_gpio_populate_parent_fwspec (struct gpio_chip *gc, -unsigned int parent_hwirq, -unsigned int parent_type) +static int msc313_gpio_populate_parent_fwspec (struct gpio_chip *gc, +union gpio_irq_fwspec *gfwspec, +unsigned int parent_hwirq, +unsigned int parent_type) { -struct irq_fwspec *fwspec; - - fwspec =kmalloc (sizeof (*fwspec),GFP_KERNEL ); -if (!fwspec) -return NULL ; +struct irq_fwspec *fwspec = &gfwspec->fwspec; fwspec->fwnode = gc->irq.parent_domain->fwnode; fwspec->param_count =3 ;
@@ -566,7 +563,7 @@ static void *msc313_gpio_populate_parent_fwspec(struct gpio_chip *gc, fwspec->param[1 ] = parent_hwirq; fwspec->param[2 ] = parent_type; -return fwspec; +return 0 ; } static int msc313e_gpio_child_to_parent_hwirq(struct gpio_chip *chip,
drivers/gpio/gpio-tegra.c +6 -9
@@ -443,15 +443,12 @@ static int tegra_gpio_child_to_parent_hwirq(struct gpio_chip *chip,return 0 ; } -static void *tegra_gpio_populate_parent_fwspec (struct gpio_chip *chip, -unsigned int parent_hwirq, -unsigned int parent_type) +static int tegra_gpio_populate_parent_fwspec (struct gpio_chip *chip, +union gpio_irq_fwspec *gfwspec, +unsigned int parent_hwirq, +unsigned int parent_type) { -struct irq_fwspec *fwspec; - - fwspec =kmalloc (sizeof (*fwspec),GFP_KERNEL ); -if (!fwspec) -return NULL ; +struct irq_fwspec *fwspec = &gfwspec->fwspec; fwspec->fwnode = chip->irq.parent_domain->fwnode; fwspec->param_count =3 ;
@@ -459,7 +456,7 @@ static void *tegra_gpio_populate_parent_fwspec(struct gpio_chip *chip, fwspec->param[1 ] = parent_hwirq; fwspec->param[2 ] = parent_type; -return fwspec; +return 0 ; }#ifdef CONFIG_PM_SLEEP
drivers/gpio/gpio-tegra186.c +6 -9
@@ -547,16 +547,13 @@ static int tegra186_gpio_irq_domain_translate(struct irq_domain *domain,return 0 ; } -static void *tegra186_gpio_populate_parent_fwspec (struct gpio_chip *chip, -unsigned int parent_hwirq, -unsigned int parent_type) +static int tegra186_gpio_populate_parent_fwspec (struct gpio_chip *chip, +union gpio_irq_fwspec *gfwspec, +unsigned int parent_hwirq, +unsigned int parent_type) {struct tegra_gpio *gpio =gpiochip_get_data (chip); -struct irq_fwspec *fwspec; - - fwspec =kmalloc (sizeof (*fwspec),GFP_KERNEL ); -if (!fwspec) -return NULL ; +struct irq_fwspec *fwspec = &gfwspec->fwspec; fwspec->fwnode = chip->irq.parent_domain->fwnode; fwspec->param_count =3 ;
@@ -564,7 +561,7 @@ static void *tegra186_gpio_populate_parent_fwspec(struct gpio_chip *chip, fwspec->param[1 ] = parent_hwirq; fwspec->param[2 ] = parent_type; -return fwspec; +return 0 ; } static int tegra186_gpio_child_to_parent_hwirq(struct gpio_chip *chip,
drivers/gpio/gpio-thunderx.c +6 -9
@@ -408,18 +408,15 @@ static int thunderx_gpio_child_to_parent_hwirq(struct gpio_chip *gc,return 0 ; } -static void *thunderx_gpio_populate_parent_alloc_info (struct gpio_chip *chip, -unsigned int parent_hwirq, -unsigned int parent_type) +static int thunderx_gpio_populate_parent_alloc_info (struct gpio_chip *chip, +union gpio_irq_fwspec *gfwspec, +unsigned int parent_hwirq, +unsigned int parent_type) { -msi_alloc_info_t *info; - - info =kmalloc (sizeof (*info),GFP_KERNEL ); -if (!info) -return NULL ; +msi_alloc_info_t *info = &gfwspec->msiinfo; info->hwirq = parent_hwirq; -return info; +return 0 ; } static int thunderx_gpio_probe(struct pci_dev *pdev,
drivers/gpio/gpio-visconti.c +6 -9
@@ -103,15 +103,12 @@ static int visconti_gpio_child_to_parent_hwirq(struct gpio_chip *gc,return -EINVAL ; } -static void *visconti_gpio_populate_parent_fwspec (struct gpio_chip *chip, -unsigned int parent_hwirq, -unsigned int parent_type) +static int visconti_gpio_populate_parent_fwspec (struct gpio_chip *chip, +union gpio_irq_fwspec *gfwspec, +unsigned int parent_hwirq, +unsigned int parent_type) { -struct irq_fwspec *fwspec; - - fwspec =kmalloc (sizeof (*fwspec),GFP_KERNEL ); -if (!fwspec) -return NULL ; +struct irq_fwspec *fwspec = &gfwspec->fwspec; fwspec->fwnode = chip->irq.parent_domain->fwnode; fwspec->param_count =3 ;
@@ -119,7 +116,7 @@ static void *visconti_gpio_populate_parent_fwspec(struct gpio_chip *chip, fwspec->param[1 ] = parent_hwirq; fwspec->param[2 ] = parent_type; -return fwspec; +return 0 ; }static int visconti_gpio_probe (struct platform_device *pdev)
drivers/gpio/gpiolib.c +18 -24
87 lines not on this page · raw message
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +6 -9
@@ -966,16 +966,13 @@ static int pmic_gpio_child_to_parent_hwirq(struct gpio_chip *chip,return 0 ; } -static void *pmic_gpio_populate_parent_fwspec (struct gpio_chip *chip, -unsigned int parent_hwirq, -unsigned int parent_type) +static int pmic_gpio_populate_parent_fwspec (struct gpio_chip *chip, +union gpio_irq_fwspec *gfwspec, +unsigned int parent_hwirq, +unsigned int parent_type) {struct pmic_gpio_state *state =gpiochip_get_data (chip); -struct irq_fwspec *fwspec; - - fwspec =kzalloc (sizeof (*fwspec),GFP_KERNEL ); -if (!fwspec) -return NULL ; +struct irq_fwspec *fwspec = &gfwspec->fwspec; fwspec->fwnode = chip->irq.parent_domain->fwnode;
@@ -985,7 +982,7 @@ static void *pmic_gpio_populate_parent_fwspec(struct gpio_chip *chip,/* param[2] must be left as 0 */ fwspec->param[3 ] = parent_type; -return fwspec; +return 0 ; }static int pmic_gpio_probe (struct platform_device *pdev)
include/linux/gpio/driver.h +19 -23
68 lines not on this page · raw message
Signature · 1 line
2.34.1
Hi March,
Quoted 26 lines · Marc Zyngier
drivers/gpio/gpio-msc313.c +5
-8@@ -550,15 +550,12 @@ static struct irq_chip msc313_gpio_irqchip = {* so we need to provide the fwspec. Essentially gpiochip_populate_parent_fwspec_twocell * that puts GIC_SPI into the first cell. */ -static void *msc313_gpio_populate_parent_fwspec (struct gpio_chip *gc, -unsigned int parent_hwirq, -unsigned int parent_type) +static int msc313_gpio_populate_parent_fwspec (struct gpio_chip *gc, +union gpio_irq_fwspec *gfwspec, +unsigned int parent_hwirq, +unsigned int parent_type) { -struct irq_fwspec *fwspec; - - fwspec =kmalloc (sizeof (*fwspec),GFP_KERNEL ); -if (!fwspec) -return NULL ; +struct irq_fwspec *fwspec = &gfwspec->fwspec; fwspec->fwnode = gc->irq.parent_domain->fwnode; fwspec->param_count =3 ;
drivers/gpio/gpio-msc313.c static void *msc313_gpio_populate_parent_fwspec(struct gpio_chip *gc, · line 569
Quoted 8 lines
drivers/gpio/gpio-msc313.c +1
-1@@ -566,7 +563,7 @@ static void *msc313_gpio_populate_parent_fwspec(struct gpio_chip *gc, fwspec->param[1 ] = parent_hwirq; fwspec->param[2 ] = parent_type; -return fwspec; +return 0 ; } static int msc313e_gpio_child_to_parent_hwirq(struct gpio_chip *chip,
This bit looks fine to me. I will test it over the weekend.
Cheers,
Daniel
Quoted 20 lines · Marc Zyngier
The gpiolib is unique in the way it uses intermediate fwspecs when feeding an interrupt specifier to the parent domain, as it relies on the
populate_parent_alloc_arg()callback to perform a dynamic allocation.THis is pretty inefficient (we free the structure almost immediately), and the only reason this isn't a stack allocation is that our ThunderX friend uses MSIs rather than a FW-constructed structure.
Let's solve it by providing a new type composed of the union of a struct
irq_fwspecand amsi_info_t, which satisfies both requirements. This allows us to use a stack allocation, and we can move the handful of users to this new scheme.Also perform some additional cleanup, such as getting rid of the stub versions of the irq_domain_translate_*cell helpers, which are never used when
CONFIG_IRQ_DOMAIN_HIERARCHYisn't selected.Tested on a Tegra186.
Quoted 11 lines
Signed-off-by Marc Zyngier <[email protected]>Cc Daniel Palmer <[email protected]>Cc Romain Perier <[email protected]>Cc Linus Walleij <[email protected]>Cc Bartosz Golaszewski <[email protected]>Cc Thierry Reding <[email protected]>Cc Jonathan Hunter <[email protected]>Cc Robert Richter <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Andy Gross <[email protected]>Cc Bjorn Andersson <[email protected]>
This looks very appetizing to me but:
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 15 ++++-----
This seems to have some changes to ->populate_parent_alloc_arg not even in linux-next, so I get confused, what are the prerequisites? (Probably something I already reviewed, but...)
Also: don't you also need to fix something in drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c?
the way I remember it it was quite similar to spmi-gpio but I may be mistaken.
Yours,
Linus Walleij
Hey Linus,
Quoted 35 lines · Linus Walleij
Quoted 20 lines · Marc Zyngier
The gpiolib is unique in the way it uses intermediate fwspecs when feeding an interrupt specifier to the parent domain, as it relies on the
populate_parent_alloc_arg()callback to perform a dynamic allocation.THis is pretty inefficient (we free the structure almost immediately), and the only reason this isn't a stack allocation is that our ThunderX friend uses MSIs rather than a FW-constructed structure.
Let's solve it by providing a new type composed of the union of a struct
irq_fwspecand amsi_info_t, which satisfies both requirements. This allows us to use a stack allocation, and we can move the handful of users to this new scheme.Also perform some additional cleanup, such as getting rid of the stub versions of the irq_domain_translate_*cell helpers, which are never used when
CONFIG_IRQ_DOMAIN_HIERARCHYisn't selected.Tested on a Tegra186.
Quoted 11 lines
Signed-off-by Marc Zyngier <[email protected]>Cc Daniel Palmer <[email protected]>Cc Romain Perier <[email protected]>Cc Linus Walleij <[email protected]>Cc Bartosz Golaszewski <[email protected]>Cc Thierry Reding <[email protected]>Cc Jonathan Hunter <[email protected]>Cc Robert Richter <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Andy Gross <[email protected]>Cc Bjorn Andersson <[email protected]>
Quoted 8 lines
This looks very appetizing to me but:
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c| 15 ++++-----This seems to have some changes to ->populate_parent_alloc_arg not even in linux-next, so I get confused, what are the prerequisites? (Probably something I already reviewed, but...)
Odd. This patch is on top of irqchip-next, which is itself already in -next (you got me worried and I just pulled everything to check).
Quoted 4 lines
Also: don't you also need to fix something in
drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c?
the way I remember it it was quite similar to spmi-gpio but I may be mistaken.
No, this one is graceful enough to use gpiochip_populate_parent_fwspec_twocell(), which is directly provided by gpiolib and thus addressed directly by this patch. Same thing for the spmi-mpp version, which uses the fourcell variant.
HTH,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Linus Walleij
Reviewed-byQuoted 41 lines · Marc Zyngier
Quoted 39 lines · Linus Walleij
Quoted 20 lines · Marc Zyngier
The gpiolib is unique in the way it uses intermediate fwspecs when feeding an interrupt specifier to the parent domain, as it relies on the
populate_parent_alloc_arg()callback to perform a dynamic allocation.THis is pretty inefficient (we free the structure almost immediately), and the only reason this isn't a stack allocation is that our ThunderX friend uses MSIs rather than a FW-constructed structure.
Let's solve it by providing a new type composed of the union of a struct
irq_fwspecand amsi_info_t, which satisfies both requirements. This allows us to use a stack allocation, and we can move the handful of users to this new scheme.Also perform some additional cleanup, such as getting rid of the stub versions of the irq_domain_translate_*cell helpers, which are never used when
CONFIG_IRQ_DOMAIN_HIERARCHYisn't selected.Tested on a Tegra186.
Quoted 11 lines
Signed-off-by Marc Zyngier <[email protected]>Cc Daniel Palmer <[email protected]>Cc Romain Perier <[email protected]>Cc Linus Walleij <[email protected]>Cc Bartosz Golaszewski <[email protected]>Cc Thierry Reding <[email protected]>Cc Jonathan Hunter <[email protected]>Cc Robert Richter <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Andy Gross <[email protected]>Cc Bjorn Andersson <[email protected]>This looks very appetizing to me but:
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c| 15 ++++-----
Quoted 7 lines
Quoted 4 lines
This seems to have some changes to ->populate_parent_alloc_arg not even in linux-next, so I get confused, what are the prerequisites? (Probably something I already reviewed, but...)
Odd. This patch is on top of irqchip-next, which is itself already in -next (you got me worried and I just pulled everything to check).
I confused it with pinctrl-ssbi-gpio.c. Simple beginners mistake.
Yours,
Linus Walleij