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;
From:   Frank Li <Frank.Li@nxp.com>
To:     manivannan.sadhasivam@linaro.org
Cc:     Frank.Li@nxp.com, bhelgaas@google.com, imx@lists.linux.dev,
        kw@linux.com, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
        linuxppc-dev@lists.ozlabs.org, lpieralisi@kernel.org,
        minghuan.Lian@nxp.com, mingkai.hu@nxp.com, robh@kernel.org,
        roy.zang@nxp.com
Subject: [PATCH v4 3/4] PCI: layerscape: Rename pf_* as pf_lut_*
Date:   Wed, 29 Nov 2023 16:44:11 -0500
Message-Id: <20231129214412.327633-4-Frank.Li@nxp.com>
In-Reply-To: <20231129214412.327633-1-Frank.Li@nxp.com>
References: <20231129214412.327633-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lMQBVrcaSkESHhj71zUa7i2L1OORRsW6OVwK+kNaZEKNHnnQeNekqve4bE/W?=
 =?us-ascii?Q?Yn+CXPyGSxSExxkl1992HetyaJC9PI9wHWg5ynZK2WTi10OCUTik+mZYSFCR?=
 =?us-ascii?Q?Gp0L/r7ZodWZMErX7l7gnOTsv2mbHeo22Ltz+6VHM4Ba5cR7cPEzLMyiR/H6?=
 =?us-ascii?Q?Aa5G+NRtTsRir/Ur5GPAlB0spAteOfQ04ZjsIp28oqiQ49JIFx7uJJmGMxBX?=
 =?us-ascii?Q?Rehoz+mMnXVPfsKV+2ojnnzGOOlrNW95+O10V/N58w5TV0SZpcsN55pJsK7j?=
 =?us-ascii?Q?Bl/qy7yabel8bwDQFiLlFB3hRok9WuCtUhdVxRrEBibiUY6dDCt5WXTvKl3O?=
 =?us-ascii?Q?VWEKwwhmoVN9BaFeX1AeF2eUe/802pdyhLGfHLZadwXSnuySeBlS6ejJjx1v?=
 =?us-ascii?Q?SV54LxShkZVFan1vRPb1r4xcGLieH/uH8TUTQZgz3tRpFL4mJ9kLjMDSRfQP?=
 =?us-ascii?Q?+ueq8tT0EjpU5ogSFeZAp+aek9HKKC1WcGsdvns97uQWbXePBKjivM348iIi?=
 =?us-ascii?Q?b9JPfIuSY8uf7PFp+tzLTVDD56DJwcjv3Tjye+1ux+H5rfl/TvvrDgIlsjWr?=
 =?us-ascii?Q?PVsoZgupV5GKwAC5tsymwrn9PbgiSQiU08j+qV/1Qq2pSrNPVGKPBHaMCV4X?=
 =?us-ascii?Q?32PSEadWjpkAeeGqZazT9vaddCKEZmD8IkCM/4htgEL3k65fUnroCDHz/+tD?=
 =?us-ascii?Q?S/lLh6PFk4bPMcOPR4AwmNLRylSNRk4s1g7XswsuzHAu2zMGlDYL+vAJVnLf?=
 =?us-ascii?Q?vugbpEH5xQiADXIHvdRnH85hXPXhXUytFh6/hLYc6AWG7O/zYftk2OxaT/is?=
 =?us-ascii?Q?2zpU0Rv2/s3BfqwuucOWnhzaBLwSovsrYJhVfVoqeBdXJMz+j3vsmU1qg9+C?=
 =?us-ascii?Q?lxCwuKl4T0YSu8s0E8/glbQ6c/ZW4twsYvbEnBqHLqvLcx2ln5pICG12faXp?=
 =?us-ascii?Q?4gknnRlOv9VuZ0zCaE0IGrluFv/92nDaoCVQJthjHjtVds7jwiXkR9KczO1V?=
 =?us-ascii?Q?g6vm5WdPWqgOBoGLTtNt8+AAPK9uUp4CBDjio7tsbI1OJNOHScX4/76x/7Lr?=
 =?us-ascii?Q?vB9GqCfsEOq/QoJPBvJwW2SHUdFtJYz7W4BOFygposOb3iltNvz+j4OhIVdV?=
 =?us-ascii?Q?Vdwk7MW+aAbLzUyRMnVPFog4mK0vsnlidVNQ/BP9hWw1UJ2qK7ekR9UECs+n?=
 =?us-ascii?Q?gkLs2AwvUQMgrvnLtBYs6Q8cFt63nQTG6b4Y8matYS5CldyNoBPA49D1wjj1?=
 =?us-ascii?Q?NzSiSUXmQbDLU8kTPaZYHf3nmc1Q/b9xC6ChQIHpqCl6LInJgDVjHQqxoTRl?=
 =?us-ascii?Q?CxTgBq7wY3zZEJuF0EzgCkDJnly4uRo0iQQ912J1juyamyPa4ZEZZr9M6Ya1?=
 =?us-ascii?Q?krpV5MC/j3fy+Lrzk1aBUpKHB40nRpSaWRsNpzfSLVqZaMYgp7e91iessZ2l?=
 =?us-ascii?Q?1RBzryBuWENDggLyuXZ62PWqGHmqVPIi6JkgzeV4IriB8XdKMimUDO7Xh4uA?=
 =?us-ascii?Q?3nKr6b7mZM6UeNEwbm3q2feZesUbP+t9hLglTkNc2wH1HjlWGAd8nHv5zlAW?=
 =?us-ascii?Q?Y8C3aKtAemSkAOpeiBs=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7c8bcb84-09f6-4a76-02bf-08dbf1246447
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 21:44:41.0554
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ww6Z89gAA72QetzSiEvYk/4fw5k3wQ78oxYNnXbRnnzfuyIy+dwRIUnF6bJ7xAkVlwf+moRl88The/dTXW1TJQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7416
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]); Wed, 29 Nov 2023 13:45:16 -0800 (PST)

'pf' and 'lut' is just difference name in difference chips, but basic it is
a MMIO base address plus an offset.

Rename it to avoid duplicate pf_* and lut_* in driver.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    pf_lut is better than pf_* or lut* because some chip use 'pf', some chip
    use 'lut'.
    
    change from v1 to v4
    - new patch at v3

 drivers/pci/controller/dwc/pci-layerscape.c | 34 ++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-layerscape.c b/drivers/pci/controller/dwc/pci-layerscape.c
index 42bca2c3b5c3e..590e07bb27002 100644
--- a/drivers/pci/controller/dwc/pci-layerscape.c
+++ b/drivers/pci/controller/dwc/pci-layerscape.c
@@ -44,7 +44,7 @@
 #define PCIE_IATU_NUM		6
 
 struct ls_pcie_drvdata {
-	const u32 pf_off;
+	const u32 pf_lut_off;
 	const struct dw_pcie_host_ops *ops;
 	int (*exit_from_l2)(struct dw_pcie_rp *pp);
 	bool scfg_support;
@@ -54,13 +54,13 @@ struct ls_pcie_drvdata {
 struct ls_pcie {
 	struct dw_pcie *pci;
 	const struct ls_pcie_drvdata *drvdata;
-	void __iomem *pf_base;
+	void __iomem *pf_lut_base;
 	struct regmap *scfg;
 	int index;
 	bool big_endian;
 };
 
-#define ls_pcie_pf_readl_addr(addr)	ls_pcie_pf_readl(pcie, addr)
+#define ls_pcie_pf_lut_readl_addr(addr)	ls_pcie_pf_lut_readl(pcie, addr)
 #define to_ls_pcie(x)	dev_get_drvdata((x)->dev)
 
 static bool ls_pcie_is_bridge(struct ls_pcie *pcie)
@@ -101,20 +101,20 @@ static void ls_pcie_fix_error_response(struct ls_pcie *pcie)
 	iowrite32(PCIE_ABSERR_SETTING, pci->dbi_base + PCIE_ABSERR);
 }
 
-static u32 ls_pcie_pf_readl(struct ls_pcie *pcie, u32 off)
+static u32 ls_pcie_pf_lut_readl(struct ls_pcie *pcie, u32 off)
 {
 	if (pcie->big_endian)
-		return ioread32be(pcie->pf_base + off);
+		return ioread32be(pcie->pf_lut_base + off);
 
-	return ioread32(pcie->pf_base + off);
+	return ioread32(pcie->pf_lut_base + off);
 }
 
-static void ls_pcie_pf_writel(struct ls_pcie *pcie, u32 off, u32 val)
+static void ls_pcie_pf_lut_writel(struct ls_pcie *pcie, u32 off, u32 val)
 {
 	if (pcie->big_endian)
-		iowrite32be(val, pcie->pf_base + off);
+		iowrite32be(val, pcie->pf_lut_base + off);
 	else
-		iowrite32(val, pcie->pf_base + off);
+		iowrite32(val, pcie->pf_lut_base + off);
 }
 
 static void ls_pcie_send_turnoff_msg(struct dw_pcie_rp *pp)
@@ -124,11 +124,11 @@ static void ls_pcie_send_turnoff_msg(struct dw_pcie_rp *pp)
 	u32 val;
 	int ret;
 
-	val = ls_pcie_pf_readl(pcie, LS_PCIE_PF_MCR);
+	val = ls_pcie_pf_lut_readl(pcie, LS_PCIE_PF_MCR);
 	val |= PF_MCR_PTOMR;
-	ls_pcie_pf_writel(pcie, LS_PCIE_PF_MCR, val);
+	ls_pcie_pf_lut_writel(pcie, LS_PCIE_PF_MCR, val);
 
-	ret = readx_poll_timeout(ls_pcie_pf_readl_addr, LS_PCIE_PF_MCR,
+	ret = readx_poll_timeout(ls_pcie_pf_lut_readl_addr, LS_PCIE_PF_MCR,
 				 val, !(val & PF_MCR_PTOMR),
 				 PCIE_PME_TO_L2_TIMEOUT_US/10,
 				 PCIE_PME_TO_L2_TIMEOUT_US);
@@ -147,15 +147,15 @@ static int ls_pcie_exit_from_l2(struct dw_pcie_rp *pp)
 	 * Set PF_MCR_EXL2S bit in LS_PCIE_PF_MCR register for the link
 	 * to exit L2 state.
 	 */
-	val = ls_pcie_pf_readl(pcie, LS_PCIE_PF_MCR);
+	val = ls_pcie_pf_lut_readl(pcie, LS_PCIE_PF_MCR);
 	val |= PF_MCR_EXL2S;
-	ls_pcie_pf_writel(pcie, LS_PCIE_PF_MCR, val);
+	ls_pcie_pf_lut_writel(pcie, LS_PCIE_PF_MCR, val);
 
 	/*
 	 * L2 exit timeout of 10ms is not defined in the specifications,
 	 * it was chosen based on empirical observations.
 	 */
-	ret = readx_poll_timeout(ls_pcie_pf_readl_addr, LS_PCIE_PF_MCR,
+	ret = readx_poll_timeout(ls_pcie_pf_lut_readl_addr, LS_PCIE_PF_MCR,
 				 val, !(val & PF_MCR_EXL2S),
 				 1000,
 				 10000);
@@ -243,7 +243,7 @@ static const struct ls_pcie_drvdata ls1021a_drvdata = {
 };
 
 static const struct ls_pcie_drvdata layerscape_drvdata = {
-	.pf_off = 0xc0000,
+	.pf_lut_off = 0xc0000,
 	.pm_support = true,
 	.exit_from_l2 = ls_pcie_exit_from_l2,
 };
@@ -293,7 +293,7 @@ static int ls_pcie_probe(struct platform_device *pdev)
 
 	pcie->big_endian = of_property_read_bool(dev->of_node, "big-endian");
 
-	pcie->pf_base = pci->dbi_base + pcie->drvdata->pf_off;
+	pcie->pf_lut_base = pci->dbi_base + pcie->drvdata->pf_lut_off;
 
 	if (pcie->drvdata->scfg_support) {
 		pcie->scfg = syscon_regmap_lookup_by_phandle(dev->of_node, "fsl,pcie-scfg");
-- 
2.34.1