Message ID | 20230623093445.3977772-2-quic_srichara@quicinc.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5645429vqr; Fri, 23 Jun 2023 02:38:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4twcBLTUWvdx+lxBdF5n+9HQkhGyKynjXUL+7PdXANqMjKrgu01WEJSaovtioB4qmZG2UP X-Received: by 2002:a54:4612:0:b0:396:e3a:9f2f with SMTP id p18-20020a544612000000b003960e3a9f2fmr18401024oip.5.1687513091555; Fri, 23 Jun 2023 02:38:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687513091; cv=none; d=google.com; s=arc-20160816; b=IIyAhCLo3qHcKi9aip7eH1xqJj8imu7jyOBirSauwOcu4MPQIFDmJ+tiUyywKkxtaK nM0Plpx1+MBHsdrhp/Bzo5frHm9jeOkoEt2xlz8WV4ng2OFBS70LtB+IDBSE4x+LzDpH Mbh6SyDxw53MpdzaFhv/BgNSc105AqCx/IDTxOzs2jh3zfEaSbWfxRtC5R6XeIBxVYU7 YtB7kDyyYeMzvpatzkd8PTBF5EuD7T+uK1nHF/+BhYGt7y9hNrFsuwTVK7WgG5S/jfpI 8DYwO6NTYeGVUYMvQjFBGp4YckgBIqHuYgj3H+5b3+qOK6U626hC5qLCKHZM1yrUFY8n Rg5w== 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:to:from :dkim-signature; bh=CA4fFdNXHG6NGLtqd1yEf3yJfAt7381Of5/B0ZNSUOQ=; b=oXnlpakoU6RF+KAPYCKwKMXpZMVa2RBwAW/IumTt4hMkqw7nrAD5G9E0oOqUrjLfY0 ZHvn0cULfehBdmvVvP0Ru8I4A8BwQ6gypqChnLLSdQUSBY45atHvIT2Ft6mmdafVf16s jejRNMMCZ9s059CxDk+mStjqcDJeS+30gXq5BOiCq/Zi5ApLLEAmNOS+jaXhAxBSIV0h mbG7Rqis3P2skhoMnGZHHt7TwPkelcEWFlum/7MECPaSIkCFW252s/1ACILHGqGTuanD K1YAj3nErxknOD73np0TCYamuGJC7b2t0PTqqSbk3X7jq6KFtW83Y7bqu6NipPHhqoOR UjnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=TXCUNHmk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i6-20020a17090a974600b0024753ec4dccsi1451670pjw.124.2023.06.23.02.37.59; Fri, 23 Jun 2023 02:38:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=TXCUNHmk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231592AbjFWJgS (ORCPT <rfc822;maxin.john@gmail.com> + 99 others); Fri, 23 Jun 2023 05:36:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231370AbjFWJgO (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 23 Jun 2023 05:36:14 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B613F1BFC; Fri, 23 Jun 2023 02:36:12 -0700 (PDT) Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35N8LMt3031533; Fri, 23 Jun 2023 09:36:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=CA4fFdNXHG6NGLtqd1yEf3yJfAt7381Of5/B0ZNSUOQ=; b=TXCUNHmkW0Q/zE8IpjxBoqMR2NTqQuMxvi5PZYC+XyPyd4JTwU8LVCjKia6XF/HBpWEJ UV3Zznzapnk5SHhu1Vw3Mey+V6JKqbbzXElzyOiCyP4RkjaLnkNJrw091lL16ygmhxOY riHKtlfrY3KYkBL5o5g3IXAqvtIEjuBpiG07JbfAjYz/wOdb0q+qqr7FrEIAMv4syESo yAsJOT27YuF5CpAu+ET6jOsb153S0aaNpQq+dSU4499dsNegqmXEWffDNWEfyPel+5Fw Ok0U9kS8xsAM+YeMjcAH44BS6/F0Zfff787DEiJfzu7opsm0sy3f0HfyeulTtWxLepM0 zQ== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3rc2rcmx9g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Jun 2023 09:36:05 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 35N9a5it006428 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Jun 2023 09:36:05 GMT Received: from win-platform-upstream01.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Fri, 23 Jun 2023 02:36:00 -0700 From: Sricharan Ramabadhran <quic_srichara@quicinc.com> To: <agross@kernel.org>, <andersson@kernel.org>, <konrad.dybcio@linaro.org>, <robh+dt@kernel.org>, <krzysztof.kozlowski+dt@linaro.org>, <conor+dt@kernel.org>, <sboyd@kernel.org>, <mturquette@baylibre.com>, <mani@kernel.org>, <lpieralisi@kernel.org>, <bhelgaas@google.com>, <linux-arm-msm@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-clk@vger.kernel.org>, <linux-pci@vger.kernel.org>, <quic_srichara@quicinc.com> Subject: [PATCH 1/4] pcie: qcom: Fix the macro PARF_SLV_ADDR_SPACE_SIZE_2_3_3 Date: Fri, 23 Jun 2023 15:04:42 +0530 Message-ID: <20230623093445.3977772-2-quic_srichara@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230623093445.3977772-1-quic_srichara@quicinc.com> References: <20230623093445.3977772-1-quic_srichara@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: 4WKcHkbJv2m3gUu8aHo8vYQf-FsEJwWZ X-Proofpoint-GUID: 4WKcHkbJv2m3gUu8aHo8vYQf-FsEJwWZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-23_03,2023-06-22_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 priorityscore=1501 mlxscore=0 spamscore=0 impostorscore=0 adultscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306230086 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769485727164948836?= X-GMAIL-MSGID: =?utf-8?q?1769485727164948836?= |
Series |
IPQ8074 pcie/wcss fixes
|
|
Commit Message
Sricharan Ramabadhran
June 23, 2023, 9:34 a.m. UTC
PARF_SLV_ADDR_SPACE_SIZE_2_3_3 macro used for IPQ8074
pcie slave addr size was initially set to 0x358, but
was wrongly changed to 0x168 as a part of
'PCI: qcom: Sort and group registers and bitfield definitions'
Fixing it back to right value here.
Without this pcie bring up on IPQ8074 is broken now.
Fixes: 769e49d87b15 ("PCI: qcom: Sort and group registers and bitfield definitions")
Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
---
drivers/pci/controller/dwc/pcie-qcom.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Fri, Jun 23, 2023 at 03:04:42PM +0530, Sricharan Ramabadhran wrote: > PARF_SLV_ADDR_SPACE_SIZE_2_3_3 macro used for IPQ8074 > pcie slave addr size was initially set to 0x358, but > was wrongly changed to 0x168 as a part of > 'PCI: qcom: Sort and group registers and bitfield definitions' > Fixing it back to right value here. > > Without this pcie bring up on IPQ8074 is broken now. > > Fixes: 769e49d87b15 ("PCI: qcom: Sort and group registers and bitfield definitions") 769e49d87b15 appeared in v6.4-rc1, so ideally this would get merged before v6.4 releases on Monday. I can try to do that, given an ack from Manivannan. > Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com> > --- > drivers/pci/controller/dwc/pcie-qcom.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c > index 4ab30892f6ef..59823beed13f 100644 > --- a/drivers/pci/controller/dwc/pcie-qcom.c > +++ b/drivers/pci/controller/dwc/pcie-qcom.c > @@ -43,7 +43,7 @@ > #define PARF_PHY_REFCLK 0x4c > #define PARF_CONFIG_BITS 0x50 > #define PARF_DBI_BASE_ADDR 0x168 > -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16c /* Register offset specific to IP ver 2.3.3 */ > +#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x358 /* Register offset specific to IP ver 2.3.3 */ > #define PARF_MHI_CLOCK_RESET_CTRL 0x174 > #define PARF_AXI_MSTR_WR_ADDR_HALT 0x178 > #define PARF_AXI_MSTR_WR_ADDR_HALT_V2 0x1a8 > -- > 2.34.1 >
On Fri, Jun 23, 2023 at 03:04:42PM +0530, Sricharan Ramabadhran wrote: > PARF_SLV_ADDR_SPACE_SIZE_2_3_3 macro used for IPQ8074 > pcie slave addr size was initially set to 0x358, but > was wrongly changed to 0x168 as a part of > 'PCI: qcom: Sort and group registers and bitfield definitions' > Fixing it back to right value here. 1) Make your subject line match the history. For example, you're fixing 769e49d87b15 ("PCI: qcom: Sort and group registers ..."), so your subject line should start with "PCI: qcom: ...". 2) It doesn't look like 769e49d87b15 changed PARF_SLV_ADDR_SPACE_SIZE_2_3_3: $ git show 769e49d87b15 | grep PARF_SLV_ADDR_SPACE_SIZE_2_3_3 +#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16C /* Register offset specific to IP ver 2.3.3 */ -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16C /* Register offset specific to IP rev 2.3.3 */ What am I missing here? Do you have another out-of-tree patch that broke this? Bjorn > Without this pcie bring up on IPQ8074 is broken now. > > Fixes: 769e49d87b15 ("PCI: qcom: Sort and group registers and bitfield definitions") > Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com> > --- > drivers/pci/controller/dwc/pcie-qcom.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c > index 4ab30892f6ef..59823beed13f 100644 > --- a/drivers/pci/controller/dwc/pcie-qcom.c > +++ b/drivers/pci/controller/dwc/pcie-qcom.c > @@ -43,7 +43,7 @@ > #define PARF_PHY_REFCLK 0x4c > #define PARF_CONFIG_BITS 0x50 > #define PARF_DBI_BASE_ADDR 0x168 > -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16c /* Register offset specific to IP ver 2.3.3 */ > +#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x358 /* Register offset specific to IP ver 2.3.3 */ > #define PARF_MHI_CLOCK_RESET_CTRL 0x174 > #define PARF_AXI_MSTR_WR_ADDR_HALT 0x178 > #define PARF_AXI_MSTR_WR_ADDR_HALT_V2 0x1a8 > -- > 2.34.1 >
On Fri, Jun 23, 2023 at 03:04:42PM +0530, Sricharan Ramabadhran wrote: > PARF_SLV_ADDR_SPACE_SIZE_2_3_3 macro used for IPQ8074 > pcie slave addr size was initially set to 0x358, but > was wrongly changed to 0x168 as a part of > 'PCI: qcom: Sort and group registers and bitfield definitions' > Fixing it back to right value here. > > Without this pcie bring up on IPQ8074 is broken now. > Subject prefix should be: "PCI: qcom: " > Fixes: 769e49d87b15 ("PCI: qcom: Sort and group registers and bitfield definitions") Fixes tag is referring to a wrong commit. Correct one is: 39171b33f652 ("PCI: qcom: Remove PCIE20_ prefix from register definitions") > Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com> > --- > drivers/pci/controller/dwc/pcie-qcom.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c > index 4ab30892f6ef..59823beed13f 100644 > --- a/drivers/pci/controller/dwc/pcie-qcom.c > +++ b/drivers/pci/controller/dwc/pcie-qcom.c > @@ -43,7 +43,7 @@ > #define PARF_PHY_REFCLK 0x4c > #define PARF_CONFIG_BITS 0x50 > #define PARF_DBI_BASE_ADDR 0x168 > -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16c /* Register offset specific to IP ver 2.3.3 */ > +#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x358 /* Register offset specific to IP ver 2.3.3 */ You should just remove PARF_SLV_ADDR_SPACE_SIZE_2_3_3 and use PARF_SLV_ADDR_SPACE_SIZE which already has the value of 0x358. - Mani > #define PARF_MHI_CLOCK_RESET_CTRL 0x174 > #define PARF_AXI_MSTR_WR_ADDR_HALT 0x178 > #define PARF_AXI_MSTR_WR_ADDR_HALT_V2 0x1a8 > -- > 2.34.1 >
Hi Bjorn, On 6/23/2023 11:30 PM, Bjorn Helgaas wrote: > On Fri, Jun 23, 2023 at 03:04:42PM +0530, Sricharan Ramabadhran wrote: >> PARF_SLV_ADDR_SPACE_SIZE_2_3_3 macro used for IPQ8074 >> pcie slave addr size was initially set to 0x358, but >> was wrongly changed to 0x168 as a part of >> 'PCI: qcom: Sort and group registers and bitfield definitions' >> Fixing it back to right value here. > > 1) Make your subject line match the history. For example, you're > fixing 769e49d87b15 ("PCI: qcom: Sort and group registers ..."), so > your subject line should start with "PCI: qcom: ...". > ok, will fix. > 2) It doesn't look like 769e49d87b15 changed > PARF_SLV_ADDR_SPACE_SIZE_2_3_3: > > $ git show 769e49d87b15 | grep PARF_SLV_ADDR_SPACE_SIZE_2_3_3 > +#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16C /* Register offset specific to IP ver 2.3.3 */ > -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16C /* Register offset specific to IP rev 2.3.3 */ > > What am I missing here? Do you have another out-of-tree patch that > broke this? 39171b33f652 ("PCI: qcom: Remove PCIE20_ prefix from register definitions") broke it. Will change and post . Regards, Sricharan
On 6/24/2023 12:02 PM, Manivannan Sadhasivam wrote: > On Fri, Jun 23, 2023 at 03:04:42PM +0530, Sricharan Ramabadhran wrote: >> PARF_SLV_ADDR_SPACE_SIZE_2_3_3 macro used for IPQ8074 >> pcie slave addr size was initially set to 0x358, but >> was wrongly changed to 0x168 as a part of >> 'PCI: qcom: Sort and group registers and bitfield definitions' >> Fixing it back to right value here. >> >> Without this pcie bring up on IPQ8074 is broken now. >> > > Subject prefix should be: "PCI: qcom: " > >> Fixes: 769e49d87b15 ("PCI: qcom: Sort and group registers and bitfield definitions") > > Fixes tag is referring to a wrong commit. Correct one is: > 39171b33f652 ("PCI: qcom: Remove PCIE20_ prefix from register definitions") > ok. >> Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com> >> --- >> drivers/pci/controller/dwc/pcie-qcom.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c >> index 4ab30892f6ef..59823beed13f 100644 >> --- a/drivers/pci/controller/dwc/pcie-qcom.c >> +++ b/drivers/pci/controller/dwc/pcie-qcom.c >> @@ -43,7 +43,7 @@ >> #define PARF_PHY_REFCLK 0x4c >> #define PARF_CONFIG_BITS 0x50 >> #define PARF_DBI_BASE_ADDR 0x168 >> -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16c /* Register offset specific to IP ver 2.3.3 */ >> +#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x358 /* Register offset specific to IP ver 2.3.3 */ > > You should just remove PARF_SLV_ADDR_SPACE_SIZE_2_3_3 and use > PARF_SLV_ADDR_SPACE_SIZE which already has the value of 0x358. > ok Regards, Sricharan
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 4ab30892f6ef..59823beed13f 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -43,7 +43,7 @@ #define PARF_PHY_REFCLK 0x4c #define PARF_CONFIG_BITS 0x50 #define PARF_DBI_BASE_ADDR 0x168 -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16c /* Register offset specific to IP ver 2.3.3 */ +#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x358 /* Register offset specific to IP ver 2.3.3 */ #define PARF_MHI_CLOCK_RESET_CTRL 0x174 #define PARF_AXI_MSTR_WR_ADDR_HALT 0x178 #define PARF_AXI_MSTR_WR_ADDR_HALT_V2 0x1a8