Commit 24258761 authored by Kevin Hao's avatar Kevin Hao Committed by Linus Walleij
Browse files

gpiolib: Add support for the irqdomain which doesn't use irq_fwspec as arg 



Some gpio's parent irqdomain may not use the struct irq_fwspec as
argument, such as msi irqdomain. So rename the callback
populate_parent_fwspec() to populate_parent_alloc_arg() and make it
allocate and populate the specific struct which is needed by the
parent irqdomain.

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Link: https://lore.kernel.org/r/20200114082821.14015-3-haokexin@gmail.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a564ac35

drivers/gpio/gpio-tegra186.c

+10 −3
Original line number Diff line number Diff line
@@ -448,17 +448,24 @@ static int tegra186_gpio_irq_domain_translate(struct irq_domain *domain, 
	return 0;

}



static void tegra186_gpio_populate_parent_fwspec(struct gpio_chip *chip,

						 struct irq_fwspec *fwspec,

static void *tegra186_gpio_populate_parent_fwspec(struct gpio_chip *chip,

						 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;



	fwspec->fwnode = chip->irq.parent_domain->fwnode;

	fwspec->param_count = 3;

	fwspec->param[0] = gpio->soc->instance;

	fwspec->param[1] = parent_hwirq;

	fwspec->param[2] = parent_type;



	return fwspec;

}



static int tegra186_gpio_child_to_parent_hwirq(struct gpio_chip *chip,
@@ -621,7 +628,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev) 
	irq->chip = &gpio->intc;

	irq->fwnode = of_node_to_fwnode(pdev->dev.of_node);

	irq->child_to_parent_hwirq = tegra186_gpio_child_to_parent_hwirq;

	irq->populate_parent_fwspec = tegra186_gpio_populate_parent_fwspec;

	irq->populate_parent_alloc_arg = tegra186_gpio_populate_parent_fwspec;

	irq->child_offset_to_irq = tegra186_gpio_child_offset_to_irq;

	irq->child_irq_domain_ops.translate = tegra186_gpio_irq_domain_translate;

	irq->handler = handle_simple_irq;

drivers/gpio/gpiolib.c

+29 −16
Original line number Diff line number Diff line
@@ -2003,7 +2003,7 @@ static int gpiochip_hierarchy_irq_domain_alloc(struct irq_domain *d, 
	irq_hw_number_t hwirq;

	unsigned int type = IRQ_TYPE_NONE;

	struct irq_fwspec *fwspec = data;

	struct irq_fwspec parent_fwspec;

	void *parent_arg;

	unsigned int parent_hwirq;

	unsigned int parent_type;

	struct gpio_irq_chip *girq = &gc->irq;
@@ -2042,23 +2042,20 @@ static int gpiochip_hierarchy_irq_domain_alloc(struct irq_domain *d, 
			    NULL, NULL);

	irq_set_probe(irq);



	/*

	 * Create a IRQ fwspec to send up to the parent irqdomain:

	 * specify the hwirq we address on the parent and tie it

	 * all together up the chain.

	 */

	parent_fwspec.fwnode = d->parent->fwnode;

	/* This parent only handles asserted level IRQs */

	girq->populate_parent_fwspec(gc, &parent_fwspec, parent_hwirq,

				     parent_type);

	parent_arg = girq->populate_parent_alloc_arg(gc, parent_hwirq, parent_type);

	if (!parent_arg)

		return -ENOMEM;



	chip_info(gc, "alloc_irqs_parent for %d parent hwirq %d\n",

		  irq, parent_hwirq);

	ret = irq_domain_alloc_irqs_parent(d, irq, 1, &parent_fwspec);

	ret = irq_domain_alloc_irqs_parent(d, irq, 1, parent_arg);

	if (ret)

		chip_err(gc,

			 "failed to allocate parent hwirq %d for hwirq %lu\n",

			 parent_hwirq, hwirq);



	kfree(parent_arg);

	return ret;

}
@@ -2095,8 +2092,8 @@ static int gpiochip_hierarchy_add_domain(struct gpio_chip *gc) 
	if (!gc->irq.child_offset_to_irq)

		gc->irq.child_offset_to_irq = gpiochip_child_offset_to_irq_noop;



	if (!gc->irq.populate_parent_fwspec)

		gc->irq.populate_parent_fwspec =

	if (!gc->irq.populate_parent_alloc_arg)

		gc->irq.populate_parent_alloc_arg =

			gpiochip_populate_parent_fwspec_twocell;



	gpiochip_hierarchy_setup_domain_ops(&gc->irq.child_irq_domain_ops);
@@ -2122,27 +2119,43 @@ static bool gpiochip_hierarchy_is_hierarchical(struct gpio_chip *gc) 
	return !!gc->irq.parent_domain;

}



void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,

					     struct irq_fwspec *fwspec,

void *gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,

					     unsigned int parent_hwirq,

					     unsigned int parent_type)

{

	struct irq_fwspec *fwspec;



	fwspec = kmalloc(sizeof(*fwspec), GFP_KERNEL);

	if (!fwspec)

		return NULL;



	fwspec->fwnode = chip->irq.parent_domain->fwnode;

	fwspec->param_count = 2;

	fwspec->param[0] = parent_hwirq;

	fwspec->param[1] = parent_type;



	return fwspec;

}

EXPORT_SYMBOL_GPL(gpiochip_populate_parent_fwspec_twocell);



void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,

					      struct irq_fwspec *fwspec,

void *gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,

					      unsigned int parent_hwirq,

					      unsigned int parent_type)

{

	struct irq_fwspec *fwspec;



	fwspec = kmalloc(sizeof(*fwspec), GFP_KERNEL);

	if (!fwspec)

		return NULL;



	fwspec->fwnode = chip->irq.parent_domain->fwnode;

	fwspec->param_count = 4;

	fwspec->param[0] = 0;

	fwspec->param[1] = parent_hwirq;

	fwspec->param[2] = 0;

	fwspec->param[3] = parent_type;



	return fwspec;

}

EXPORT_SYMBOL_GPL(gpiochip_populate_parent_fwspec_fourcell);

drivers/pinctrl/qcom/pinctrl-spmi-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ static int pmic_gpio_probe(struct platform_device *pdev) 
	girq->fwnode = of_node_to_fwnode(state->dev->of_node);

	girq->parent_domain = parent_domain;

	girq->child_to_parent_hwirq = pmic_gpio_child_to_parent_hwirq;

	girq->populate_parent_fwspec = gpiochip_populate_parent_fwspec_fourcell;

	girq->populate_parent_alloc_arg = gpiochip_populate_parent_fwspec_fourcell;

	girq->child_offset_to_irq = pmic_gpio_child_offset_to_irq;

	girq->child_irq_domain_ops.translate = pmic_gpio_domain_translate;

drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev) 
	girq->fwnode = of_node_to_fwnode(pctrl->dev->of_node);

	girq->parent_domain = parent_domain;

	girq->child_to_parent_hwirq = pm8xxx_child_to_parent_hwirq;

	girq->populate_parent_fwspec = gpiochip_populate_parent_fwspec_fourcell;

	girq->populate_parent_alloc_arg = gpiochip_populate_parent_fwspec_fourcell;

	girq->child_offset_to_irq = pm8xxx_child_offset_to_irq;

	girq->child_irq_domain_ops.translate = pm8xxx_domain_translate;

include/linux/gpio/driver.h

+8 −13
Original line number Diff line number Diff line
@@ -94,16 +94,15 @@ struct gpio_irq_chip { 
				     unsigned int *parent_type);



	/**

	 * @populate_parent_fwspec:

	 * @populate_parent_alloc_arg :

	 *

	 * This optional callback populates the &struct irq_fwspec for the

	 * parent's IRQ domain. If this is not specified, then

	 * This optional callback allocates and populates the specific struct

	 * for the parent's IRQ domain. If this is not specified, then

	 * &gpiochip_populate_parent_fwspec_twocell will be used. A four-cell

	 * variant named &gpiochip_populate_parent_fwspec_fourcell is also

	 * available.

	 */

	void (*populate_parent_fwspec)(struct gpio_chip *chip,

				       struct irq_fwspec *fwspec,

	void *(*populate_parent_alloc_arg)(struct gpio_chip *chip,

				       unsigned int parent_hwirq,

				       unsigned int parent_type);
@@ -537,26 +536,22 @@ struct bgpio_pdata { 


#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY



void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,

					     struct irq_fwspec *fwspec,

void *gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,

					     unsigned int parent_hwirq,

					     unsigned int parent_type);

void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,

					      struct irq_fwspec *fwspec,

void *gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,

					      unsigned int parent_hwirq,

					      unsigned int parent_type);



#else



static inline void gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,

						    struct irq_fwspec *fwspec,

static inline void *gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *chip,

						    unsigned int parent_hwirq,

						    unsigned int parent_type)

{

}



static inline void gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,

						     struct irq_fwspec *fwspec,

static inline void *gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *chip,

						     unsigned int parent_hwirq,

						     unsigned int parent_type)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE