| Message ID | 1499084308-2232-6-git-send-email-kgunda@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On 07/03, Kiran Gunda wrote: > diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c > index 5285245..2d2e39c 100644 > --- a/drivers/spmi/spmi-pmic-arb.c > +++ b/drivers/spmi/spmi-pmic-arb.c > @@ -621,6 +621,19 @@ static int qpnpint_irq_set_type(struct irq_data *d, unsigned int flow_type) > return 0; > } > > +static int qpnpint_irq_set_wake(struct irq_data *d, unsigned int on) > +{ > + struct spmi_pmic_arb *pmic_arb = irq_data_get_irq_chip_data(d); > + int ret; > + > + if (on) > + ret = enable_irq_wake(pmic_arb->irq); > + else > + ret = disable_irq_wake(pmic_arb->irq); Could be simplified to return irq_set_irq_wake(pmic_arb->irq, on); ? > + > + return ret; > +} > + > static int qpnpint_get_irqchip_state(struct irq_data *d, > enum irqchip_irq_state which, > bool *state)
On 2017-07-06 12:16, Stephen Boyd wrote: > On 07/03, Kiran Gunda wrote: >> diff --git a/drivers/spmi/spmi-pmic-arb.c >> b/drivers/spmi/spmi-pmic-arb.c >> index 5285245..2d2e39c 100644 >> --- a/drivers/spmi/spmi-pmic-arb.c >> +++ b/drivers/spmi/spmi-pmic-arb.c >> @@ -621,6 +621,19 @@ static int qpnpint_irq_set_type(struct irq_data >> *d, unsigned int flow_type) >> return 0; >> } >> >> +static int qpnpint_irq_set_wake(struct irq_data *d, unsigned int on) >> +{ >> + struct spmi_pmic_arb *pmic_arb = irq_data_get_irq_chip_data(d); >> + int ret; >> + >> + if (on) >> + ret = enable_irq_wake(pmic_arb->irq); >> + else >> + ret = disable_irq_wake(pmic_arb->irq); > > Could be simplified to > > return irq_set_irq_wake(pmic_arb->irq, on); > > ? > yes. Will modify it. >> + >> + return ret; >> +} >> + >> static int qpnpint_get_irqchip_state(struct irq_data *d, >> enum irqchip_irq_state which, >> bool *state) -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 5285245..2d2e39c 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -621,6 +621,19 @@ static int qpnpint_irq_set_type(struct irq_data *d, unsigned int flow_type) return 0; } +static int qpnpint_irq_set_wake(struct irq_data *d, unsigned int on) +{ + struct spmi_pmic_arb *pmic_arb = irq_data_get_irq_chip_data(d); + int ret; + + if (on) + ret = enable_irq_wake(pmic_arb->irq); + else + ret = disable_irq_wake(pmic_arb->irq); + + return ret; +} + static int qpnpint_get_irqchip_state(struct irq_data *d, enum irqchip_irq_state which, bool *state) @@ -643,9 +656,9 @@ static int qpnpint_get_irqchip_state(struct irq_data *d, .irq_mask = qpnpint_irq_mask, .irq_unmask = qpnpint_irq_unmask, .irq_set_type = qpnpint_irq_set_type, + .irq_set_wake = qpnpint_irq_set_wake, .irq_get_irqchip_state = qpnpint_get_irqchip_state, - .flags = IRQCHIP_MASK_ON_SUSPEND - | IRQCHIP_SKIP_SET_WAKE, + .flags = IRQCHIP_MASK_ON_SUSPEND, }; static int qpnpint_irq_domain_dt_translate(struct irq_domain *d, @@ -1071,8 +1084,6 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) irq_set_chained_handler_and_data(pmic_arb->irq, pmic_arb_chained_irq, pmic_arb); - enable_irq_wake(pmic_arb->irq); - err = spmi_controller_add(ctrl); if (err) goto err_domain_remove;
Currently the driver sets the pmic_arb core interrupt as wakeup capable irrespective of the child irqs which causes the system to wakeup unnecessarily. To fix this, set the core interrupt as wakeup capable only if any of the child irqs request for it. Do this by marking it as wakeup capable in the irq_set_wake callback. Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> --- drivers/spmi/spmi-pmic-arb.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)