irqchip: qcom-pdc: Remove irq_set_wake and irq_enable callbacksLA.UM.8.13.r1-09500-SAIPAN.0

Currently irq_mask callback is not completely masking irq at PDC
in case if the interrupt is marked for wakeup. Leaving it unmasked
at PDC may generate unwanted wakeups.

Remove irq_set_wake and irq_enable callbacks and manage interrupt
mask and unmask at PDC (and its parent GIC) using irq_mask and
irq_unmask callbacks.

Change-Id: Ife0026e612b8136ef3c26023fc0bda7b5286bae8
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>

1 files changed, 4 insertions, 32 deletions

diff --git a/drivers/irqchip/qcom-pdc.c b/drivers/irqchip/qcom-pdc.c
index 83b49b4c5367..c8752a742b94 100644
--- a/drivers/irqchip/qcom-pdc.c
+++ b/drivers/irqchip/qcom-pdc.c
@@ -74,22 +74,6 @@ static void pdc_enable_intr(struct irq_data *d, bool on)
 	raw_spin_unlock(&pdc_lock);
 }
 
-static int qcom_pdc_gic_set_wake(struct irq_data *d, unsigned int on)
-{
-	if (d->hwirq == GPIO_NO_WAKE_IRQ)
-		return 0;
-
-	if (on) {
-		pdc_enable_intr(d, true);
-		set_bit(d->hwirq, pdc_wake_irqs);
-		irq_chip_enable_parent(d);
-	} else {
-		clear_bit(d->hwirq, pdc_wake_irqs);
-	}
-
-	return irq_chip_set_wake_parent(d, on);
-}
-
 static int qcom_pdc_gic_get_irqchip_state(struct irq_data *d,
 		enum irqchip_irq_state which, bool *state)
 {
@@ -108,15 +92,6 @@ static int qcom_pdc_gic_set_irqchip_state(struct irq_data *d,
 	return irq_chip_set_parent_state(d, which, value);
 }
 
-static void qcom_pdc_gic_enable(struct irq_data *d)
-{
-	if (d->hwirq == GPIO_NO_WAKE_IRQ)
-		return;
-
-	pdc_enable_intr(d, true);
-	irq_chip_enable_parent(d);
-}
-
 static void qcom_pdc_gic_mask(struct irq_data *d)
 {
 	if (d->hwirq == GPIO_NO_WAKE_IRQ)
@@ -124,10 +99,7 @@ static void qcom_pdc_gic_mask(struct irq_data *d)
 
 	ipc_log_string(pdc_ipc_log, "PIN=%d mask", d->hwirq);
 	irq_chip_mask_parent(d);
-
-	/* Mask at PDC if not a wake irq */
-	if (!test_bit(d->hwirq, pdc_wake_irqs))
-		pdc_enable_intr(d, false);
+	pdc_enable_intr(d, false);
 }
 
 static void qcom_pdc_gic_unmask(struct irq_data *d)
@@ -137,6 +109,7 @@ static void qcom_pdc_gic_unmask(struct irq_data *d)
 
 	ipc_log_string(pdc_ipc_log, "PIN=%d unmask", d->hwirq);
 	irq_chip_unmask_parent(d);
+	pdc_enable_intr(d, true);
 }
 
 static int spi_configure_type(irq_hw_number_t hwirq, unsigned int type)
@@ -253,14 +226,13 @@ static struct irq_chip qcom_pdc_gic_chip = {
 	.irq_eoi		= irq_chip_eoi_parent,
 	.irq_mask		= qcom_pdc_gic_mask,
 	.irq_unmask		= qcom_pdc_gic_unmask,
-	.irq_enable		= qcom_pdc_gic_enable,
 	.irq_get_irqchip_state	= qcom_pdc_gic_get_irqchip_state,
 	.irq_set_irqchip_state	= qcom_pdc_gic_set_irqchip_state,
 	.irq_retrigger		= irq_chip_retrigger_hierarchy,
 	.irq_set_type		= qcom_pdc_gic_set_type,
-	.irq_set_wake		= qcom_pdc_gic_set_wake,
 	.flags			= IRQCHIP_MASK_ON_SUSPEND |
-				  IRQCHIP_SET_TYPE_MASKED,
+				  IRQCHIP_SET_TYPE_MASKED |
+				  IRQCHIP_SKIP_SET_WAKE,
 	.irq_set_vcpu_affinity	= irq_chip_set_vcpu_affinity_parent,
 	.irq_set_affinity	= irq_chip_set_affinity_parent,
 };