Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
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 1/4] PCI: layerscape: Add function pointer for exit_from_l2()
Date:   Wed, 29 Nov 2023 16:44:09 -0500
Message-Id: <20231129214412.327633-2-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?dywSFHG9nYnye8+ZLNH5uHFG20x0To6gW3UUoWUZoLy6Sq8i/8WWbNKIK/SL?=
 =?us-ascii?Q?C3gQRjCxRoTFOQUvlCeTsRb/her6DuuSdCCbK3O856e81m8BWjCko2Hcw1C7?=
 =?us-ascii?Q?7USa2ujJ8DeCc4wtSvmaV/Im3EWU9eiRradQctY/Hc/dPEtjraoJwiosQw0Z?=
 =?us-ascii?Q?s56B4osEnsuFAVGZliw1t3VXKSxp9R0w0NIf2Lth/Ut0ayCvLGcZ96Lt+n/k?=
 =?us-ascii?Q?Tn5hXRazp7SPQiUfMiSBdo7YoOhjbCI2VwIPkw8CUdsf6d+pCSNAESv51OSh?=
 =?us-ascii?Q?lKElu7GKAHStweULM12A1VCW73eqt/oD6jchMfPBdyVQgRJ1loXnocCHP1sO?=
 =?us-ascii?Q?Jnt+fs+dMvP16GTjQeHO4rqo2Cz36YYZ0QaZFDxHnl8gLfeBVxf54ji2GxD2?=
 =?us-ascii?Q?rIoXg/rUqU6aaA683UYaJ3Q/KcYIyCRPtJnD3+G4UeugDRxvTwwLHtdS9kyn?=
 =?us-ascii?Q?E207w/man7dSzxaf1IPgSE3O0Iy1RMkyaRkj8SdFvuE35qqPV84GKmsfMEdP?=
 =?us-ascii?Q?Awa4+Xl47GH2wvK7j/eNlkWiBzVGG+l+Rd66y/Gv9fuELGSvgxP/3LASw0YT?=
 =?us-ascii?Q?J+nZHg1XLhtWqk1YrBrrRl3M5Yk6W/LXe/P+Lsumlappfzu+14pDMDFHpvg6?=
 =?us-ascii?Q?aL4Nktf3DLL4DG/O4dh6RSisEvx4pncbTNmpfdTVIU41zrLIrgTNU+0IDL3u?=
 =?us-ascii?Q?qejcHIjaZRtKVC2lE62LZHFeedv+/24EhlxrnQqwOogc143r6jS16gH6xJkM?=
 =?us-ascii?Q?zZk3db10vPvn9vN7lMz4bEvC3S17MGbzfcX31/iHe/1zoQ7Cz61lggUh1+dh?=
 =?us-ascii?Q?YZRmTP1Yzz4ffuV8e+//xt+3vrHQlOATYoyNvpcSra32CRMlRahdmh0Kewn/?=
 =?us-ascii?Q?4af7VqrNnPGwzdwAibQWqTPacPPC8Be97KbzSr55IaB9iZnd69osmb+8wErk?=
 =?us-ascii?Q?v7oxVvJzePvOquYA5jfylZPzQ/BuLGhe096FPXeJWyoJcTsT7nDSQGAbq8/y?=
 =?us-ascii?Q?4G8aiXMfvXWa120kvDCyfX7znTJIdfDTuptPXcI3UDK7UDKIV7Qxn9FPXB7L?=
 =?us-ascii?Q?gzVE2GkwcleRBKffQX50WOdxmzALuajz5YJJvmHfCfKKoh93Pofj1jo6Xyvn?=
 =?us-ascii?Q?a9iCvrdFqrmZ2tX7AbhKCuixmKe7QrLCE3heiFm9q4vElZE0PM7++/x517YC?=
 =?us-ascii?Q?hINAAyeapKZiMYhH1zQphgQacKSFb5ho3vNp6Qxmb0C2ZKs8s58HRLZ58mRC?=
 =?us-ascii?Q?CMg0ao9cFag6gdcJ0r4o9UvYE8cGeMAQIEMbHgelS5dOBhFUkfobrvQvCu1i?=
 =?us-ascii?Q?4ieuTbcnnk24gU9sd1xEHmKkwtkxA9tleyLP2FDXL4za/A+QjnBFEZwgK0cf?=
 =?us-ascii?Q?xKGnsA1cRh8i71xE/c+MVZpu7kyJr2IiCg4qD7z7qMSwArTt+uiRLsiBnLLi?=
 =?us-ascii?Q?W1S4QUY7Zh9T+UXAT5uxRagctttcg+PpuO7fydJ2timJtOzVYHLzfsFxhxfI?=
 =?us-ascii?Q?JBFvmo6bvPDPuv8GVKTyL2ZLyK9e14uzq4JWuNDfxcQlkDwvZzrFIzOItkk2?=
 =?us-ascii?Q?5Pg3oSc97dIAD1BvD7o=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 80f38b58-d0fc-4b2d-c1f9-08dbf1245fa1
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:33.0058
 (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: ovnIhvgycGnHm5mQ7WBhp5iI8DiK9PGm9QlwiE9wf39eNiYWUZOnguSV0dqhndkJl/nqNCg2Ure/zvkn3snxdA==
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 morse.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 (morse.vger.email [0.0.0.0]); Wed, 29 Nov 2023 13:44:59 -0800 (PST)

Since difference SoCs require different sequence for exiting L2, let's add
a separate "exit_from_l2()" callback. This callback can be used to execute
SoC specific sequence.

Change ls_pcie_exit_from_l2() return value from void to int. Return error
if exit_from_l2() failure at exit resume flow.

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v3 to v4
    - update commit message
      Add mani's review by tag
    Change from v2 to v3
    - fixed according to mani's feedback
      1. update commit message
      2. move dw_pcie_host_ops to next patch
      3. check return value from exit_from_l2()
    Change from v1 to v2
    - change subject 'a' to 'A'
    
    Change from v1 to v2
    - change subject 'a' to 'A'

 drivers/pci/controller/dwc/pci-layerscape.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-layerscape.c b/drivers/pci/controller/dwc/pci-layerscape.c
index 37956e09c65bd..aea89926bcc4f 100644
--- a/drivers/pci/controller/dwc/pci-layerscape.c
+++ b/drivers/pci/controller/dwc/pci-layerscape.c
@@ -39,6 +39,7 @@
 
 struct ls_pcie_drvdata {
 	const u32 pf_off;
+	int (*exit_from_l2)(struct dw_pcie_rp *pp);
 	bool pm_support;
 };
 
@@ -125,7 +126,7 @@ static void ls_pcie_send_turnoff_msg(struct dw_pcie_rp *pp)
 		dev_err(pcie->pci->dev, "PME_Turn_off timeout\n");
 }
 
-static void ls_pcie_exit_from_l2(struct dw_pcie_rp *pp)
+static int ls_pcie_exit_from_l2(struct dw_pcie_rp *pp)
 {
 	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
 	struct ls_pcie *pcie = to_ls_pcie(pci);
@@ -150,6 +151,8 @@ static void ls_pcie_exit_from_l2(struct dw_pcie_rp *pp)
 				 10000);
 	if (ret)
 		dev_err(pcie->pci->dev, "L2 exit timeout\n");
+
+	return ret;
 }
 
 static int ls_pcie_host_init(struct dw_pcie_rp *pp)
@@ -180,6 +183,7 @@ static const struct ls_pcie_drvdata ls1021a_drvdata = {
 static const struct ls_pcie_drvdata layerscape_drvdata = {
 	.pf_off = 0xc0000,
 	.pm_support = true,
+	.exit_from_l2 = ls_pcie_exit_from_l2,
 };
 
 static const struct of_device_id ls_pcie_of_match[] = {
@@ -247,11 +251,14 @@ static int ls_pcie_suspend_noirq(struct device *dev)
 static int ls_pcie_resume_noirq(struct device *dev)
 {
 	struct ls_pcie *pcie = dev_get_drvdata(dev);
+	int ret;
 
 	if (!pcie->drvdata->pm_support)
 		return 0;
 
-	ls_pcie_exit_from_l2(&pcie->pci->pp);
+	ret = pcie->drvdata->exit_from_l2(&pcie->pci->pp);
+	if (ret)
+		return ret;
 
 	return dw_pcie_resume_noirq(pcie->pci);
 }
-- 
2.34.1