Commit 374b87a0 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

pinctrl: apple-gpio: Make the irqchip immutable 



Prevent gpiolib from messing with the irqchip by advertising
the irq_chip structure as immutable, making it const, and adding
the various calls that gpiolib relies upon.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220419141846.598305-7-maz@kernel.org
parent 15d8c14a

drivers/pinctrl/pinctrl-apple-gpio.c

+16 −13
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct apple_gpio_pinctrl { 


	struct pinctrl_desc pinctrl_desc;

	struct gpio_chip gpio_chip;

	struct irq_chip irq_chip;

	u8 irqgrps[];

};
@@ -275,17 +274,21 @@ static unsigned int apple_gpio_irq_type(unsigned int type) 


static void apple_gpio_irq_mask(struct irq_data *data)

{

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(irq_data_get_irq_chip_data(data));

	struct gpio_chip *gc = irq_data_get_irq_chip_data(data);

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(gc);



	apple_gpio_set_reg(pctl, data->hwirq, REG_GPIOx_MODE,

	                   FIELD_PREP(REG_GPIOx_MODE, REG_GPIOx_IN_IRQ_OFF));

	gpiochip_disable_irq(gc, data->hwirq);

}



static void apple_gpio_irq_unmask(struct irq_data *data)

{

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(irq_data_get_irq_chip_data(data));

	struct gpio_chip *gc = irq_data_get_irq_chip_data(data);

	struct apple_gpio_pinctrl *pctl = gpiochip_get_data(gc);

	unsigned int irqtype = apple_gpio_irq_type(irqd_get_trigger_type(data));



	gpiochip_enable_irq(gc, data->hwirq);

	apple_gpio_set_reg(pctl, data->hwirq, REG_GPIOx_MODE,

	                   FIELD_PREP(REG_GPIOx_MODE, irqtype));

}
@@ -343,13 +346,15 @@ static void apple_gpio_irq_handler(struct irq_desc *desc) 
	chained_irq_exit(chip, desc);

}



static struct irq_chip apple_gpio_irqchip = {

static const struct irq_chip apple_gpio_irqchip = {

	.name			= "Apple-GPIO",

	.irq_startup		= apple_gpio_irq_startup,

	.irq_ack		= apple_gpio_irq_ack,

	.irq_mask		= apple_gpio_irq_mask,

	.irq_unmask		= apple_gpio_irq_unmask,

	.irq_set_type		= apple_gpio_irq_set_type,

	.flags			= IRQCHIP_IMMUTABLE,

	GPIOCHIP_IRQ_RESOURCE_HELPERS,

};



/* Probe & register */
@@ -360,8 +365,6 @@ static int apple_gpio_register(struct apple_gpio_pinctrl *pctl) 
	void **irq_data = NULL;

	int ret;



	pctl->irq_chip = apple_gpio_irqchip;



	pctl->gpio_chip.label = dev_name(pctl->dev);

	pctl->gpio_chip.request = gpiochip_generic_request;

	pctl->gpio_chip.free = gpiochip_generic_free;
@@ -377,7 +380,7 @@ static int apple_gpio_register(struct apple_gpio_pinctrl *pctl) 
	if (girq->num_parents) {

		int i;



		girq->chip = &pctl->irq_chip;

		gpio_irq_chip_set_chip(girq, &apple_gpio_irqchip);

		girq->parent_handler = apple_gpio_irq_handler;



		girq->parents = kmalloc_array(girq->num_parents,