Merge tag 'sound-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / drivers / irqchip / irq-loongson-pch-pic.c

diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c
index c01b9c2..437f1af 100644 (file)
--- a/drivers/irqchip/irq-loongson-pch-pic.c
+++ b/drivers/irqchip/irq-loongson-pch-pic.c
@@ -15,6 +15,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/syscore_ops.h>
 
 /* Registers */
 #define PCH_PIC_MASK           0x20
@@ -42,6 +43,9 @@ struct pch_pic {
        raw_spinlock_t          pic_lock;
        u32                     vec_count;
        u32                     gsi_base;
+       u32                     saved_vec_en[PIC_REG_COUNT];
+       u32                     saved_vec_pol[PIC_REG_COUNT];
+       u32                     saved_vec_edge[PIC_REG_COUNT];
 };
 
 static struct pch_pic *pch_pic_priv[MAX_IO_PICS];
@@ -145,6 +149,7 @@ static struct irq_chip pch_pic_irq_chip = {
        .irq_ack                = pch_pic_ack_irq,
        .irq_set_affinity       = irq_chip_set_affinity_parent,
        .irq_set_type           = pch_pic_set_type,
+       .flags                  = IRQCHIP_SKIP_SET_WAKE,
 };
 
 static int pch_pic_domain_translate(struct irq_domain *d,
@@ -155,15 +160,21 @@ static int pch_pic_domain_translate(struct irq_domain *d,
        struct pch_pic *priv = d->host_data;
        struct device_node *of_node = to_of_node(fwspec->fwnode);
 
-       if (fwspec->param_count < 1)
-               return -EINVAL;
-
        if (of_node) {
+               if (fwspec->param_count < 2)
+                       return -EINVAL;
+
                *hwirq = fwspec->param[0] + priv->ht_vec_base;
                *type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK;
        } else {
+               if (fwspec->param_count < 1)
+                       return -EINVAL;
+
                *hwirq = fwspec->param[0] - priv->gsi_base;
-               *type = IRQ_TYPE_NONE;
+               if (fwspec->param_count > 1)
+                       *type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK;
+               else
+                       *type = IRQ_TYPE_NONE;
        }
 
        return 0;
@@ -228,6 +239,46 @@ static void pch_pic_reset(struct pch_pic *priv)
        }
 }
 
+static int pch_pic_suspend(void)
+{
+       int i, j;
+
+       for (i = 0; i < nr_pics; i++) {
+               for (j = 0; j < PIC_REG_COUNT; j++) {
+                       pch_pic_priv[i]->saved_vec_pol[j] =
+                               readl(pch_pic_priv[i]->base + PCH_PIC_POL + 4 * j);
+                       pch_pic_priv[i]->saved_vec_edge[j] =
+                               readl(pch_pic_priv[i]->base + PCH_PIC_EDGE + 4 * j);
+                       pch_pic_priv[i]->saved_vec_en[j] =
+                               readl(pch_pic_priv[i]->base + PCH_PIC_MASK + 4 * j);
+               }
+       }
+
+       return 0;
+}
+
+static void pch_pic_resume(void)
+{
+       int i, j;
+
+       for (i = 0; i < nr_pics; i++) {
+               pch_pic_reset(pch_pic_priv[i]);
+               for (j = 0; j < PIC_REG_COUNT; j++) {
+                       writel(pch_pic_priv[i]->saved_vec_pol[j],
+                                       pch_pic_priv[i]->base + PCH_PIC_POL + 4 * j);
+                       writel(pch_pic_priv[i]->saved_vec_edge[j],
+                                       pch_pic_priv[i]->base + PCH_PIC_EDGE + 4 * j);
+                       writel(pch_pic_priv[i]->saved_vec_en[j],
+                                       pch_pic_priv[i]->base + PCH_PIC_MASK + 4 * j);
+               }
+       }
+}
+
+static struct syscore_ops pch_pic_syscore_ops = {
+       .suspend =  pch_pic_suspend,
+       .resume =  pch_pic_resume,
+};
+
 static int pch_pic_init(phys_addr_t addr, unsigned long size, int vec_base,
                        struct irq_domain *parent_domain, struct fwnode_handle *domain_handle,
                        u32 gsi_base)
@@ -260,6 +311,8 @@ static int pch_pic_init(phys_addr_t addr, unsigned long size, int vec_base,
        pch_pic_handle[nr_pics] = domain_handle;
        pch_pic_priv[nr_pics++] = priv;
 
+       register_syscore_ops(&pch_pic_syscore_ops);
+
        return 0;
 
 iounmap_base:
@@ -325,9 +378,8 @@ int find_pch_pic(u32 gsi)
        return -1;
 }
 
-static int __init
-pch_lpc_parse_madt(union acpi_subtable_headers *header,
-                      const unsigned long end)
+static int __init pch_lpc_parse_madt(union acpi_subtable_headers *header,
+                                       const unsigned long end)
 {
        struct acpi_madt_lpc_pic *pchlpc_entry = (struct acpi_madt_lpc_pic *)header;
 
@@ -336,8 +388,12 @@ pch_lpc_parse_madt(union acpi_subtable_headers *header,
 
 static int __init acpi_cascade_irqdomain_init(void)
 {
-       acpi_table_parse_madt(ACPI_MADT_TYPE_LPC_PIC,
-                             pch_lpc_parse_madt, 0);
+       int r;
+
+       r = acpi_table_parse_madt(ACPI_MADT_TYPE_LPC_PIC, pch_lpc_parse_madt, 0);
+       if (r < 0)
+               return r;
+
        return 0;
 }
 
@@ -364,7 +420,7 @@ int __init pch_pic_acpi_init(struct irq_domain *parent,
        }
 
        if (acpi_pchpic->id == 0)
-               acpi_cascade_irqdomain_init();
+               ret = acpi_cascade_irqdomain_init();
 
        return ret;
 }