Message ID | 1700577493-18538-2-git-send-email-quic_msarkar@quicinc.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp667300vqb; Tue, 21 Nov 2023 06:38:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IHex/Do5vazdvxzYXD0Iyzn5RGhltNXlw6OGPW2T8JKx5tJDhaVuwBmQ/+tr6NQcJjbnKhs X-Received: by 2002:a92:c74d:0:b0:359:4b3b:530d with SMTP id y13-20020a92c74d000000b003594b3b530dmr10036898ilp.7.1700577528460; Tue, 21 Nov 2023 06:38:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700577528; cv=none; d=google.com; s=arc-20160816; b=GIfkQqAQbg4VOlOL5kIo25GcMM7+o81bA3q92QhpxhsDbb5DBmknJvG5bjOtC32uSO 2Vpumj4LCSy3NQmch9r+3DvAlyz1cT3LLD3Vck5ao55kWdv7rkj8m4Gudiyt6G2QCxmu EwQjZLepDl1O8DV5VdtsRBxz5VxPDGVrYr6mVHAdF4A7ndBWC2WN4q+e5RXlgpDdG08O ckGrno8jl5w9dZe09aWn/QdJh4o7LVZpvy/lgBzkvYVCjvCaCBk1ZkunVK493+CCAyI4 iz6+YdVpDtymH8lubSZc28yc1cBQBwwXyc79IVksUkdK/It5Hi6wa754yvPz+Y7I16Lb 0q4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FqK8FStuSlvhx/YFe4T8dZetm2QKHmUdcZdxb0W+pHw=; fh=Pk1D+TX8j7yMhBoMDvb6Z0dI8+uPCwWwrh/XHSBJc1k=; b=C8ZlzheeM2rFnqzeR6B16owGPDq73wOtESuno96GDp45OS2dRExJyyO0tUZrf2kwjV YLV7BgP2jNUP+8mET7x8U+9bzqJLFAp9wXBck3IHQFSVYtxeMI34pMFiM5F93XF2hhz4 Q19SB2ktji7z89UB8NFurdJsW4wLX4VmYTTGpuc95egBpgEkZPcT5vzOHpn4wWrUGDyL QfKUKRj0BuzuYPPEbwyM6Pi5mA1wNzFeuFrsItnXvTrr4l8DlrKP/mb0qweagy2dmNQb XSkD4xDYLrF7XIYd2bggdzpNumRIYBXveqJmSPdkqUV81KgXLo6Jld9wwOuoMba9x2gu oTGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=aYP98fHc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id u2-20020a631402000000b005b92b048254si10729861pgl.201.2023.11.21.06.38.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 06:38:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=aYP98fHc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 9F259803BAB0; Tue, 21 Nov 2023 06:38:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234520AbjKUOie (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Tue, 21 Nov 2023 09:38:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234105AbjKUOib (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 21 Nov 2023 09:38:31 -0500 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C521113; Tue, 21 Nov 2023 06:38:27 -0800 (PST) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ALE1sCf011131; Tue, 21 Nov 2023 14:38:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=qcppdkim1; bh=FqK8FStuSlvhx/YFe4T8dZetm2QKHmUdcZdxb0W+pHw=; b=aYP98fHcnlVkDrtZem21SQ8bg5iFbOz5t2O9NmM7BnDi3EI6WJN7RgvSWQ1S+BrmMddo ME43TmmgcXTulEt33jUtmcsFqY2UT2mddEdLtaqNbsBG7fSNezFPx2Xyml/lDjbwzJ0J 2fMmJMGahcelTTzTAEkGW2AmTV2HSToHb0P442T9BtD6bjMOpvgHxy6P0Yu2bl5UtAi2 gtvLEwBhpww2c5yWgGggIqF8XwBroaWOljo+YEQbM5kz4aKWZgNQ3b0hQi1fg+r7yeZ3 X1ACqU+QXte5s2PDhxstnABEZXUbKHuVLKMt2SUupnvwADXEPmYqfyLkZ889CnTDKF+g Tg== Received: from apblrppmta01.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.18.19]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3uguwxrp5y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 14:38:20 +0000 Received: from pps.filterd (APBLRPPMTA01.qualcomm.com [127.0.0.1]) by APBLRPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTP id 3ALEaZ9f004089; Tue, 21 Nov 2023 14:38:17 GMT Received: from pps.reinject (localhost [127.0.0.1]) by APBLRPPMTA01.qualcomm.com (PPS) with ESMTP id 3uepbke7pv-1; Tue, 21 Nov 2023 14:38:17 +0000 Received: from APBLRPPMTA01.qualcomm.com (APBLRPPMTA01.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ALEcGbM006075; Tue, 21 Nov 2023 14:38:16 GMT Received: from hu-sgudaval-hyd.qualcomm.com (hu-msarkar-hyd.qualcomm.com [10.213.111.194]) by APBLRPPMTA01.qualcomm.com (PPS) with ESMTP id 3ALEcGne006071; Tue, 21 Nov 2023 14:38:16 +0000 Received: by hu-sgudaval-hyd.qualcomm.com (Postfix, from userid 3891782) id 9DC694C8E; Tue, 21 Nov 2023 20:08:15 +0530 (+0530) From: Mrinmay Sarkar <quic_msarkar@quicinc.com> To: agross@kernel.org, andersson@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, konrad.dybcio@linaro.org, mani@kernel.org, robh+dt@kernel.org Cc: quic_shazhuss@quicinc.com, quic_nitegupt@quicinc.com, quic_ramkri@quicinc.com, quic_nayiluri@quicinc.com, dmitry.baryshkov@linaro.org, robh@kernel.org, quic_krichai@quicinc.com, quic_vbadigan@quicinc.com, quic_parass@quicinc.com, quic_schintav@quicinc.com, quic_shijjose@quicinc.com, Mrinmay Sarkar <quic_msarkar@quicinc.com>, Lorenzo Pieralisi <lpieralisi@kernel.org>, =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= <kw@linux.com>, Bjorn Helgaas <bhelgaas@google.com>, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v4 1/3] PCI: qcom: Enable cache coherency for SA8775P RC Date: Tue, 21 Nov 2023 20:08:11 +0530 Message-Id: <1700577493-18538-2-git-send-email-quic_msarkar@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1700577493-18538-1-git-send-email-quic_msarkar@quicinc.com> References: <1700577493-18538-1-git-send-email-quic_msarkar@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: oZVcOPCB51X3X3yI8grG0j88gVIF6VOL X-Proofpoint-ORIG-GUID: oZVcOPCB51X3X3yI8grG0j88gVIF6VOL X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-21_08,2023-11-21_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 impostorscore=0 suspectscore=0 bulkscore=0 mlxlogscore=782 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311210114 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 21 Nov 2023 06:38:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783184782701377013 X-GMAIL-MSGID: 1783184782701377013 |
Series |
arm64: qcom: sa8775p: add cache coherency support for SA8775P
|
|
Commit Message
Mrinmay Sarkar
Nov. 21, 2023, 2:38 p.m. UTC
In a multiprocessor system cache snooping maintains the consistency
of caches. Snooping logic is disabled from HW on this platform.
Cache coherency doesn’t work without enabling this logic.
8775 has IP version 1.34.0 so intruduce a new cfg(cfg_1_34_0) for this
platform. Assign no_snoop_override flag into struct qcom_pcie_cfg and
set it true in cfg_1_34_0 and enable cache snooping if this particular
flag is true.
Signed-off-by: Mrinmay Sarkar <quic_msarkar@quicinc.com>
---
drivers/pci/controller/dwc/pcie-qcom.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
Comments
On Tue, 21 Nov 2023 at 16:38, Mrinmay Sarkar <quic_msarkar@quicinc.com> wrote: > > In a multiprocessor system cache snooping maintains the consistency > of caches. Snooping logic is disabled from HW on this platform. > Cache coherency doesn’t work without enabling this logic. > > 8775 has IP version 1.34.0 so intruduce a new cfg(cfg_1_34_0) for this > platform. Assign no_snoop_override flag into struct qcom_pcie_cfg and > set it true in cfg_1_34_0 and enable cache snooping if this particular > flag is true. Thank you! > > Signed-off-by: Mrinmay Sarkar <quic_msarkar@quicinc.com> > --- > drivers/pci/controller/dwc/pcie-qcom.c | 20 +++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Tue, Nov 21, 2023 at 08:08:11PM +0530, Mrinmay Sarkar wrote: > In a multiprocessor system cache snooping maintains the consistency > of caches. Snooping logic is disabled from HW on this platform. > Cache coherency doesn’t work without enabling this logic. > > 8775 has IP version 1.34.0 so intruduce a new cfg(cfg_1_34_0) for this > platform. Assign no_snoop_override flag into struct qcom_pcie_cfg and > set it true in cfg_1_34_0 and enable cache snooping if this particular > flag is true. > I just happen to check the internal register details of other platforms and I see this PCIE_PARF_NO_SNOOP_OVERIDE register with the reset value of 0x0. So going by the logic of this patch, this register needs to be configured for other platforms as well to enable cache coherency, but it seems like not the case as we never did and all are working fine (so far no issues reported). So this gives me an impression that this patch is wrong or needs modification. So, Nacked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > Signed-off-by: Mrinmay Sarkar <quic_msarkar@quicinc.com> > --- > drivers/pci/controller/dwc/pcie-qcom.c | 20 +++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c > index 6902e97..76f03fc 100644 > --- a/drivers/pci/controller/dwc/pcie-qcom.c > +++ b/drivers/pci/controller/dwc/pcie-qcom.c > @@ -51,6 +51,7 @@ > #define PARF_SID_OFFSET 0x234 > #define PARF_BDF_TRANSLATE_CFG 0x24c > #define PARF_SLV_ADDR_SPACE_SIZE 0x358 > +#define PCIE_PARF_NO_SNOOP_OVERIDE 0x3d4 > #define PARF_DEVICE_TYPE 0x1000 > #define PARF_BDF_TO_SID_TABLE_N 0x2000 > > @@ -117,6 +118,10 @@ > /* PARF_LTSSM register fields */ > #define LTSSM_EN BIT(8) > > +/* PARF_NO_SNOOP_OVERIDE register fields */ > +#define WR_NO_SNOOP_OVERIDE_EN BIT(1) > +#define RD_NO_SNOOP_OVERIDE_EN BIT(3) > + > /* PARF_DEVICE_TYPE register fields */ > #define DEVICE_TYPE_RC 0x4 > > @@ -229,6 +234,7 @@ struct qcom_pcie_ops { > > struct qcom_pcie_cfg { > const struct qcom_pcie_ops *ops; > + bool no_snoop_overide; I'd suggest to name variables after their usecase and not the register. Like, bool enable_cache_snoop; > }; > > struct qcom_pcie { > @@ -961,6 +967,13 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) > > static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie) > { > + const struct qcom_pcie_cfg *pcie_cfg = pcie->cfg; > + > + /* Enable cache snooping for SA8775P */ This comment doesn't belong here. It can be added while setting the flag in cfg. > + if (pcie_cfg->no_snoop_overide) > + writel(WR_NO_SNOOP_OVERIDE_EN | RD_NO_SNOOP_OVERIDE_EN, > + pcie->parf + PCIE_PARF_NO_SNOOP_OVERIDE); > + > qcom_pcie_clear_hpc(pcie->pci); > > return 0; > @@ -1331,6 +1344,11 @@ static const struct qcom_pcie_cfg cfg_1_9_0 = { > .ops = &ops_1_9_0, > }; > > +static const struct qcom_pcie_cfg cfg_1_34_0 = { > + .ops = &ops_1_9_0, > + .no_snoop_overide = true, > +}; > + > static const struct qcom_pcie_cfg cfg_2_1_0 = { > .ops = &ops_2_1_0, > }; > @@ -1627,7 +1645,7 @@ static const struct of_device_id qcom_pcie_match[] = { > { .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 }, > { .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 }, > { .compatible = "qcom,pcie-sa8540p", .data = &cfg_1_9_0 }, > - { .compatible = "qcom,pcie-sa8775p", .data = &cfg_1_9_0}, > + { .compatible = "qcom,pcie-sa8775p", .data = &cfg_1_34_0}, > { .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 }, > { .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 }, > { .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 }, > -- > 2.7.4 > >
On 30.11.2023 06:21, Manivannan Sadhasivam wrote: > On Tue, Nov 21, 2023 at 08:08:11PM +0530, Mrinmay Sarkar wrote: >> In a multiprocessor system cache snooping maintains the consistency >> of caches. Snooping logic is disabled from HW on this platform. >> Cache coherency doesn’t work without enabling this logic. >> >> 8775 has IP version 1.34.0 so intruduce a new cfg(cfg_1_34_0) for this >> platform. Assign no_snoop_override flag into struct qcom_pcie_cfg and >> set it true in cfg_1_34_0 and enable cache snooping if this particular >> flag is true. >> > > I just happen to check the internal register details of other platforms and I > see this PCIE_PARF_NO_SNOOP_OVERIDE register with the reset value of 0x0. So > going by the logic of this patch, this register needs to be configured for other > platforms as well to enable cache coherency, but it seems like not the case as > we never did and all are working fine (so far no issues reported). Guess we know that already [1] The question is whether this override is necessary, or the default internal state is OK on other platforms Konrad [1] https://lore.kernel.org/linux-arm-msm/cb4324aa-8035-ce6e-94ef-a31ed070225c@quicinc.com/
On Thu, Nov 30, 2023 at 11:09:59AM +0100, Konrad Dybcio wrote: > On 30.11.2023 06:21, Manivannan Sadhasivam wrote: > > On Tue, Nov 21, 2023 at 08:08:11PM +0530, Mrinmay Sarkar wrote: > >> In a multiprocessor system cache snooping maintains the consistency > >> of caches. Snooping logic is disabled from HW on this platform. > >> Cache coherency doesn’t work without enabling this logic. > >> > >> 8775 has IP version 1.34.0 so intruduce a new cfg(cfg_1_34_0) for this > >> platform. Assign no_snoop_override flag into struct qcom_pcie_cfg and > >> set it true in cfg_1_34_0 and enable cache snooping if this particular > >> flag is true. > >> > > > > I just happen to check the internal register details of other platforms and I > > see this PCIE_PARF_NO_SNOOP_OVERIDE register with the reset value of 0x0. So > > going by the logic of this patch, this register needs to be configured for other > > platforms as well to enable cache coherency, but it seems like not the case as > > we never did and all are working fine (so far no issues reported). > > Guess we know that already [1] > Bummer! I didn't look close into that reply :/ > The question is whether this override is necessary, or the default > internal state is OK on other platforms > I digged into it further... The register description says "Enable this bit x to override no_snoop". So NO_SNOOP is the default behavior unless bit x is set in this register. This means if bit x is set, MRd and MWd TLPs originating from the desired PCIe controller (Requester) will have the NO_SNOOP bit set in the header. So the completer will not do any cache management for the transaction. But this also requires that the address referenced by the TLP is not cacheable. My guess here is that, hw designers have enabled the NO_SNOOP logic by default and running into coherency issues on the completer side. Maybe due to the addresses are cacheable always (?). And the default value of this register has no impact on the NO_SNOOP attribute unless specific bits are set. But I need to confirm my above observations with HW team. Until then, I will hold on to my Nack. - Mani > Konrad > > [1] https://lore.kernel.org/linux-arm-msm/cb4324aa-8035-ce6e-94ef-a31ed070225c@quicinc.com/
On Thu, Nov 30, 2023 at 04:39:09PM +0530, Manivannan Sadhasivam wrote: > On Thu, Nov 30, 2023 at 11:09:59AM +0100, Konrad Dybcio wrote: > > On 30.11.2023 06:21, Manivannan Sadhasivam wrote: > > > On Tue, Nov 21, 2023 at 08:08:11PM +0530, Mrinmay Sarkar wrote: > > >> In a multiprocessor system cache snooping maintains the consistency > > >> of caches. Snooping logic is disabled from HW on this platform. > > >> Cache coherency doesn’t work without enabling this logic. > > >> > > >> 8775 has IP version 1.34.0 so intruduce a new cfg(cfg_1_34_0) for this > > >> platform. Assign no_snoop_override flag into struct qcom_pcie_cfg and > > >> set it true in cfg_1_34_0 and enable cache snooping if this particular > > >> flag is true. > > >> > > > > > > I just happen to check the internal register details of other platforms and I > > > see this PCIE_PARF_NO_SNOOP_OVERIDE register with the reset value of 0x0. So > > > going by the logic of this patch, this register needs to be configured for other > > > platforms as well to enable cache coherency, but it seems like not the case as > > > we never did and all are working fine (so far no issues reported). > > > > Guess we know that already [1] > > > > Bummer! I didn't look close into that reply :/ > > > The question is whether this override is necessary, or the default > > internal state is OK on other platforms > > > > I digged into it further... > > The register description says "Enable this bit x to override no_snoop". So > NO_SNOOP is the default behavior unless bit x is set in this register. > > This means if bit x is set, MRd and MWd TLPs originating from the desired PCIe > controller (Requester) will have the NO_SNOOP bit set in the header. So the > completer will not do any cache management for the transaction. But this also > requires that the address referenced by the TLP is not cacheable. > > My guess here is that, hw designers have enabled the NO_SNOOP logic by default > and running into coherency issues on the completer side. Maybe due to the > addresses are cacheable always (?). > > And the default value of this register has no impact on the NO_SNOOP attribute > unless specific bits are set. > > But I need to confirm my above observations with HW team. Until then, I will > hold on to my Nack. > I had some discussions with the hardware folks and clarified my concerns with them. Here is the summary: Due to some hardware changes, SA8775P has set the NO_SNOOP attribute in its TLP for all the PCIe controllers. NO_SNOOP attribute when set, the requester is indicating that there no cache coherency issues exit for the addressed memory on the host i.e., memory is not cached. But in reality, requester cannot assume this unless there is a complete control/visibility over the addressed memory on the host. And worst case, if the memory is cached on the host, it may lead to memory corruption issues. It should be noted that the caching of memory on the host is not solely dependent on the NO_SNOOP attribute in TLP. So to avoid the corruption, this patch overrides the NO_SNOOP attribute by setting the PCIE_PARF_NO_SNOOP_OVERIDE register. This patch is not needed for other upstream supported platforms since they do not set NO_SNOOP attribute by default. Mrinmay, please add above information in the commit message while sending v2. I'm taking by NACK back. - Mani
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 6902e97..76f03fc 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -51,6 +51,7 @@ #define PARF_SID_OFFSET 0x234 #define PARF_BDF_TRANSLATE_CFG 0x24c #define PARF_SLV_ADDR_SPACE_SIZE 0x358 +#define PCIE_PARF_NO_SNOOP_OVERIDE 0x3d4 #define PARF_DEVICE_TYPE 0x1000 #define PARF_BDF_TO_SID_TABLE_N 0x2000 @@ -117,6 +118,10 @@ /* PARF_LTSSM register fields */ #define LTSSM_EN BIT(8) +/* PARF_NO_SNOOP_OVERIDE register fields */ +#define WR_NO_SNOOP_OVERIDE_EN BIT(1) +#define RD_NO_SNOOP_OVERIDE_EN BIT(3) + /* PARF_DEVICE_TYPE register fields */ #define DEVICE_TYPE_RC 0x4 @@ -229,6 +234,7 @@ struct qcom_pcie_ops { struct qcom_pcie_cfg { const struct qcom_pcie_ops *ops; + bool no_snoop_overide; }; struct qcom_pcie { @@ -961,6 +967,13 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie) { + const struct qcom_pcie_cfg *pcie_cfg = pcie->cfg; + + /* Enable cache snooping for SA8775P */ + if (pcie_cfg->no_snoop_overide) + writel(WR_NO_SNOOP_OVERIDE_EN | RD_NO_SNOOP_OVERIDE_EN, + pcie->parf + PCIE_PARF_NO_SNOOP_OVERIDE); + qcom_pcie_clear_hpc(pcie->pci); return 0; @@ -1331,6 +1344,11 @@ static const struct qcom_pcie_cfg cfg_1_9_0 = { .ops = &ops_1_9_0, }; +static const struct qcom_pcie_cfg cfg_1_34_0 = { + .ops = &ops_1_9_0, + .no_snoop_overide = true, +}; + static const struct qcom_pcie_cfg cfg_2_1_0 = { .ops = &ops_2_1_0, }; @@ -1627,7 +1645,7 @@ static const struct of_device_id qcom_pcie_match[] = { { .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 }, { .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 }, { .compatible = "qcom,pcie-sa8540p", .data = &cfg_1_9_0 }, - { .compatible = "qcom,pcie-sa8775p", .data = &cfg_1_9_0}, + { .compatible = "qcom,pcie-sa8775p", .data = &cfg_1_34_0}, { .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 }, { .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 }, { .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 },