Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9951e76f authored by Marc Zyngier's avatar Marc Zyngier Committed by Greg Kroah-Hartman
Browse files

genirq: Allow the PM device to originate from irq domain 



[ Upstream commit 1f8863bfb5ca500ea1c7669b16b1931ba27fce20 ]

As a preparation to moving the reference to the device used for
runtime power management, add a new 'dev' field to the irqdomain
structure for that exact purpose.

The irq_chip_pm_{get,put}() helpers are made aware of the dual
location via a new private helper.

No functional change intended.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Link: https://lore.kernel.org/r/20220201120310.878267-2-maz@kernel.org


Stable-dep-of: 33b1c47d1fc0 ("irqchip/imx-irqsteer: Handle runtime power management correctly")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b044588a

include/linux/irqdomain.h

+10 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ struct irq_domain_chip_generic; 
 * @gc: Pointer to a list of generic chips. There is a helper function for

 *      setting up one or more generic chips for interrupt controllers

 *      drivers using the generic chip library which uses this pointer.

 * @dev: Pointer to a device that the domain represent, and that will be

 *       used for power management purposes.

 * @parent: Pointer to parent irq_domain to support hierarchy irq_domains

 * @debugfs_file: dentry for the domain debugfs file

 *
@@ -169,6 +171,7 @@ struct irq_domain { 
	struct fwnode_handle *fwnode;

	enum irq_domain_bus_token bus_token;

	struct irq_domain_chip_generic *gc;

	struct device *dev;

#ifdef	CONFIG_IRQ_DOMAIN_HIERARCHY

	struct irq_domain *parent;

#endif
@@ -225,6 +228,13 @@ static inline struct device_node *irq_domain_get_of_node(struct irq_domain *d) 
	return to_of_node(d->fwnode);

}



static inline void irq_domain_set_pm_device(struct irq_domain *d,

					    struct device *dev)

{

	if (d)

		d->dev = dev;

}



#ifdef CONFIG_IRQ_DOMAIN

struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,

						const char *name, phys_addr_t *pa);

kernel/irq/chip.c

+18 −5
Original line number Diff line number Diff line
@@ -1528,6 +1528,17 @@ int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) 
	return 0;

}



static struct device *irq_get_parent_device(struct irq_data *data)

{

	if (data->chip->parent_device)

		return data->chip->parent_device;



	if (data->domain)

		return data->domain->dev;



	return NULL;

}



/**

 * irq_chip_pm_get - Enable power for an IRQ chip

 * @data:	Pointer to interrupt specific data
@@ -1537,12 +1548,13 @@ int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) 
 */

int irq_chip_pm_get(struct irq_data *data)

{

	struct device *dev = irq_get_parent_device(data);

	int retval;



	if (IS_ENABLED(CONFIG_PM) && data->chip->parent_device) {

		retval = pm_runtime_get_sync(data->chip->parent_device);

	if (IS_ENABLED(CONFIG_PM) && dev) {

		retval = pm_runtime_get_sync(dev);

		if (retval < 0) {

			pm_runtime_put_noidle(data->chip->parent_device);

			pm_runtime_put_noidle(dev);

			return retval;

		}

	}
@@ -1560,10 +1572,11 @@ int irq_chip_pm_get(struct irq_data *data) 
 */

int irq_chip_pm_put(struct irq_data *data)

{

	struct device *dev = irq_get_parent_device(data);

	int retval = 0;



	if (IS_ENABLED(CONFIG_PM) && data->chip->parent_device)

		retval = pm_runtime_put(data->chip->parent_device);

	if (IS_ENABLED(CONFIG_PM) && dev)

		retval = pm_runtime_put(dev);



	return (retval < 0) ? retval : 0;

}