Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751674AbdHRP3H (ORCPT ); Fri, 18 Aug 2017 11:29:07 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:59016 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750987AbdHRP3F (ORCPT ); Fri, 18 Aug 2017 11:29:05 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 58CC460287 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, Rob Herring , Mark Rutland , Kiran Gunda , Abhijeet Dharmapurikar , David Collins , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: shawnguo@kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org Subject: [PATCH V2] spmi: pmic-arb: Enforce the ownership check optionally Date: Fri, 18 Aug 2017 20:58:29 +0530 Message-Id: <1503070110-15018-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: 2738 Lines: 77 The peripheral ownership check is not necessary on single master platforms. Hence, enforce the peripheral ownership check optionally. Signed-off-by: Kiran Gunda Tested-by: Shawn Guo --- v2: Fixed the commit message. Added Shawn's 'Tested-by' tag. v1: 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 Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt | 6 ++++++ drivers/spmi/spmi-pmic-arb.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt b/Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt index e16b9b5..da708e8 100644 --- a/Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt +++ b/Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt @@ -42,6 +42,10 @@ Required properties: cell 4: interrupt flags indicating level-sense information, as defined in dt-bindings/interrupt-controller/irq.h +Optional properties: +- qcom,enforce-ownership : A boolean property. If defined the peripheral + ownership check is enforced. Otherwise the ownership + check is ignored. Example: spmi { @@ -62,4 +66,6 @@ Example: interrupt-controller; #interrupt-cells = <4>; + + qcom,enforce-ownership; }; diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index ca9bdd3..354c949 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -167,6 +167,7 @@ struct spmi_pmic_arb { u16 *ppid_to_apid; u16 last_apid; struct apid_data apid_data[PMIC_ARB_MAX_PERIPHS]; + bool enforce_ownership; }; /** @@ -707,7 +708,8 @@ static int qpnpint_irq_domain_dt_translate(struct irq_domain *d, } apid = rc; - if (pmic_arb->apid_data[apid].irq_ee != pmic_arb->ee) { + if (pmic_arb->enforce_ownership && + 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); @@ -1236,6 +1238,9 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) } pmic_arb->ee = ee; + pmic_arb->enforce_ownership = + of_property_read_bool(pdev->dev.of_node, "qcom,enforce-ownership"); + mapping_table = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PERIPHS, sizeof(*mapping_table), GFP_KERNEL); if (!mapping_table) { -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project