forked from Minki/linux
spmi: pmic-arb: fix missing interrupts
irq_enable is called when the device resumes. Note that the irq_enable is called regardless of whether the interrupt was marked enabled/disabled in the descriptor or whether it was masked/unmasked at the controller while resuming. The current driver unconditionally clears the interrupt in its irq_enable callback. This is dangerous as any interrupts that happen right before the resume could be missed. Remove the irq_enable callback and use mask/unmask instead. Also remove struct pmic_arb_irq_spec as it serves no real purpose. It is used only in the translate function and the code is much cleaner without it. Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6bc546e71e
commit
f6dda8e2e8
|
@ -588,17 +588,6 @@ static void qpnpint_irq_unmask(struct irq_data *d)
|
||||||
qpnpint_spmi_write(d, QPNPINT_REG_EN_CLR, &data, 1);
|
qpnpint_spmi_write(d, QPNPINT_REG_EN_CLR, &data, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void qpnpint_irq_enable(struct irq_data *d)
|
|
||||||
{
|
|
||||||
u8 irq = d->hwirq >> 8;
|
|
||||||
u8 data;
|
|
||||||
|
|
||||||
qpnpint_irq_unmask(d);
|
|
||||||
|
|
||||||
data = BIT(irq);
|
|
||||||
qpnpint_spmi_write(d, QPNPINT_REG_LATCHED_CLR, &data, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int qpnpint_irq_set_type(struct irq_data *d, unsigned int flow_type)
|
static int qpnpint_irq_set_type(struct irq_data *d, unsigned int flow_type)
|
||||||
{
|
{
|
||||||
struct spmi_pmic_arb_qpnpint_type type;
|
struct spmi_pmic_arb_qpnpint_type type;
|
||||||
|
@ -647,7 +636,6 @@ static int qpnpint_get_irqchip_state(struct irq_data *d,
|
||||||
|
|
||||||
static struct irq_chip pmic_arb_irqchip = {
|
static struct irq_chip pmic_arb_irqchip = {
|
||||||
.name = "pmic_arb",
|
.name = "pmic_arb",
|
||||||
.irq_enable = qpnpint_irq_enable,
|
|
||||||
.irq_ack = qpnpint_irq_ack,
|
.irq_ack = qpnpint_irq_ack,
|
||||||
.irq_mask = qpnpint_irq_mask,
|
.irq_mask = qpnpint_irq_mask,
|
||||||
.irq_unmask = qpnpint_irq_unmask,
|
.irq_unmask = qpnpint_irq_unmask,
|
||||||
|
@ -657,12 +645,6 @@ static struct irq_chip pmic_arb_irqchip = {
|
||||||
| IRQCHIP_SKIP_SET_WAKE,
|
| IRQCHIP_SKIP_SET_WAKE,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct spmi_pmic_arb_irq_spec {
|
|
||||||
unsigned slave:4;
|
|
||||||
unsigned per:8;
|
|
||||||
unsigned irq:3;
|
|
||||||
};
|
|
||||||
|
|
||||||
static int qpnpint_irq_domain_dt_translate(struct irq_domain *d,
|
static int qpnpint_irq_domain_dt_translate(struct irq_domain *d,
|
||||||
struct device_node *controller,
|
struct device_node *controller,
|
||||||
const u32 *intspec,
|
const u32 *intspec,
|
||||||
|
@ -671,7 +653,6 @@ static int qpnpint_irq_domain_dt_translate(struct irq_domain *d,
|
||||||
unsigned int *out_type)
|
unsigned int *out_type)
|
||||||
{
|
{
|
||||||
struct spmi_pmic_arb *pa = d->host_data;
|
struct spmi_pmic_arb *pa = d->host_data;
|
||||||
struct spmi_pmic_arb_irq_spec spec;
|
|
||||||
int rc;
|
int rc;
|
||||||
u8 apid;
|
u8 apid;
|
||||||
|
|
||||||
|
@ -686,10 +667,6 @@ static int qpnpint_irq_domain_dt_translate(struct irq_domain *d,
|
||||||
if (intspec[0] > 0xF || intspec[1] > 0xFF || intspec[2] > 0x7)
|
if (intspec[0] > 0xF || intspec[1] > 0xFF || intspec[2] > 0x7)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
spec.slave = intspec[0];
|
|
||||||
spec.per = intspec[1];
|
|
||||||
spec.irq = intspec[2];
|
|
||||||
|
|
||||||
rc = pa->ver_ops->ppid_to_apid(pa, intspec[0],
|
rc = pa->ver_ops->ppid_to_apid(pa, intspec[0],
|
||||||
(intspec[1] << 8), &apid);
|
(intspec[1] << 8), &apid);
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
|
@ -705,9 +682,9 @@ static int qpnpint_irq_domain_dt_translate(struct irq_domain *d,
|
||||||
if (apid < pa->min_apid)
|
if (apid < pa->min_apid)
|
||||||
pa->min_apid = apid;
|
pa->min_apid = apid;
|
||||||
|
|
||||||
*out_hwirq = spec.slave << 24
|
*out_hwirq = (intspec[0] & 0xF) << 24
|
||||||
| spec.per << 16
|
| (intspec[1] & 0xFF) << 16
|
||||||
| spec.irq << 8
|
| (intspec[2] & 0x7) << 8
|
||||||
| apid;
|
| apid;
|
||||||
*out_type = intspec[3] & IRQ_TYPE_SENSE_MASK;
|
*out_type = intspec[3] & IRQ_TYPE_SENSE_MASK;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user