irqchip/qcom-pdc: Reset PDC interrupts during init
authorMaulik Shah <mkshah@codeaurora.org>
Mon, 28 Sep 2020 04:32:04 +0000 (10:02 +0530)
committerMarc Zyngier <maz@kernel.org>
Tue, 6 Oct 2020 10:26:41 +0000 (11:26 +0100)
Kexec can directly boot into a new kernel without going to complete
reboot. This can leave the previous kernel's configuration for PDC
interrupts as is.

Clear previous kernel's configuration during init by setting interrupts
in enable bank to zero. The IRQs specified in qcom,pdc-ranges property
are the only ones that can be used by the new kernel so clear only those
IRQs. The remaining ones may be in use by a different kernel and should
not be set by new kernel.

Suggested-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Tested-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/1601267524-20199-7-git-send-email-mkshah@codeaurora.org
drivers/irqchip/qcom-pdc.c

index acc0620f315ada55843ee70254401f013d406a01..bd39e9de6ecf735e44f2a1b7fe6742b0cb3a1e9a 100644 (file)
@@ -341,7 +341,8 @@ static const struct irq_domain_ops qcom_pdc_gpio_ops = {
 
 static int pdc_setup_pin_mapping(struct device_node *np)
 {
-       int ret, n;
+       int ret, n, i;
+       u32 irq_index, reg_index, val;
 
        n = of_property_count_elems_of_size(np, "qcom,pdc-ranges", sizeof(u32));
        if (n <= 0 || n % 3)
@@ -370,6 +371,14 @@ static int pdc_setup_pin_mapping(struct device_node *np)
                                                 &pdc_region[n].cnt);
                if (ret)
                        return ret;
+
+               for (i = 0; i < pdc_region[n].cnt; i++) {
+                       reg_index = (i + pdc_region[n].pin_base) >> 5;
+                       irq_index = (i + pdc_region[n].pin_base) & 0x1f;
+                       val = pdc_reg_read(IRQ_ENABLE_BANK, reg_index);
+                       val &= ~BIT(irq_index);
+                       pdc_reg_write(IRQ_ENABLE_BANK, reg_index, val);
+               }
        }
 
        return 0;