genirq: Allow the PM device to originate from irq domain

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: Marc Zyngier <maz@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Tony Lindgren <tony@atomide.com>
Acked-by: Bartosz Golaszewski <brgl@bgdev.pl>
Link: https://lore.kernel.org/r/20220201120310.878267-2-maz@kernel.org

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index d476405..be25a33 100644 (file)
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -151,6 +151,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
  *
  * Revmap data, used internally by irq_domain
@@ -171,6 +173,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
@@ -226,6 +229,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);

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index c093246..a2a12cd 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -1558,6 +1558,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
@@ -1567,12 +1578,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;
                }
        }
@@ -1590,10 +1602,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;
 }