Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753985AbdHWMkT (ORCPT ); Wed, 23 Aug 2017 08:40:19 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:35976 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753915AbdHWMkR (ORCPT ); Wed, 23 Aug 2017 08:40:17 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D340A60115 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kgunda@codeaurora.org From: Kiran Gunda To: gregkh@linuxfoundation.org, sboyd@codeaurora.org, Kiran Gunda , Abhijeet Dharmapurikar , David Collins , linux-kernel@vger.kernel.org Cc: shawnguo@kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org Subject: [PATCH V1] spmi: pmic-arb: Move the ownership check to irq_chip callback Date: Wed, 23 Aug 2017 18:09:36 +0530 Message-Id: <1503491978-4283-1-git-send-email-kgunda@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2487 Lines: 69 Check the irq ownership in the irq_request_resources callback instead of checking it during the irq mapping. That we can prevent installing the flow handler for the interrupt that is not owned by the EE and allow the irq translation during the gpio driver probe. Signed-off-by: Kiran Gunda --- This patch depends on the below patch series. Please take this patch along with this series. [PATCH V2 00/12]: spmi: pmic-arb: Support for HW v5 and other fixes drivers/spmi/spmi-pmic-arb.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index ca9bdd3..360b821 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -666,6 +666,24 @@ static int qpnpint_get_irqchip_state(struct irq_data *d, return 0; } +static int qpnpint_irq_request_resources(struct irq_data *d) +{ + struct spmi_pmic_arb *pmic_arb = irq_data_get_irq_chip_data(d); + u16 periph = hwirq_to_per(d->hwirq); + u16 apid = hwirq_to_apid(d->hwirq); + u16 sid = hwirq_to_sid(d->hwirq); + u16 irq = hwirq_to_irq(d->hwirq); + + if (pmic_arb->apid_data[apid].irq_ee != pmic_arb->ee) { + dev_err(&pmic_arb->spmic->dev, "failed to xlate sid = %#x, periph = %#x, irq = %u: ee=%u but owner=%u\n", + sid, periph, irq, pmic_arb->ee, + pmic_arb->apid_data[apid].irq_ee); + return -ENODEV; + } + + return 0; +} + static struct irq_chip pmic_arb_irqchip = { .name = "pmic_arb", .irq_ack = qpnpint_irq_ack, @@ -674,6 +692,7 @@ static int qpnpint_get_irqchip_state(struct irq_data *d, .irq_set_type = qpnpint_irq_set_type, .irq_set_wake = qpnpint_irq_set_wake, .irq_get_irqchip_state = qpnpint_get_irqchip_state, + .irq_request_resources = qpnpint_irq_request_resources, .flags = IRQCHIP_MASK_ON_SUSPEND, }; @@ -707,13 +726,6 @@ static int qpnpint_irq_domain_dt_translate(struct irq_domain *d, } apid = rc; - if (pmic_arb->apid_data[apid].irq_ee != pmic_arb->ee) { - dev_err(&pmic_arb->spmic->dev, "failed to xlate sid = %#x, periph = %#x, irq = %u: ee=%u but owner=%u\n", - intspec[0], intspec[1], intspec[2], pmic_arb->ee, - pmic_arb->apid_data[apid].irq_ee); - return -ENODEV; - } - /* Keep track of {max,min}_apid for bounding search during interrupt */ if (apid > pmic_arb->max_apid) pmic_arb->max_apid = apid; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project