Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
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 v6 1/4] PCI: layerscape: Add function pointer for exit_from_l2()
Date:   Mon,  4 Dec 2023 11:08:26 -0500
Message-Id: <20231204160829.2498703-2-Frank.Li@nxp.com>
In-Reply-To: <20231204160829.2498703-1-Frank.Li@nxp.com>
References: <20231204160829.2498703-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?KkiYNH/8GcLG+Pvsct5JMAYbvxWeMN0yHgYItaNXfaFBwnHzsmM+MxM7mOvm?=
 =?us-ascii?Q?jN+03Xhiq98cmDFZWsQsa1ReCfIJuK0pfQCEjS/bgzGKPbyeZEaGC/3vCUlO?=
 =?us-ascii?Q?Sbq38ItNpTw/gJavNLVYwtZQExn61xBlCWhRlZVEA98y2WvqZ+BkjZddWx2q?=
 =?us-ascii?Q?gC1/QiW6Jv53slFvsoyFJOii2JbG0PWLshGFyumfXiIKXiVBvAEzg6PGjUBe?=
 =?us-ascii?Q?WTqqCbsqkoTFRaVIEyysrQHtq6oSjfNR409VayIuwcDwUIZ8OHiZelhkpOdU?=
 =?us-ascii?Q?caAEdLxIT9FJy4SZuqNOgWBMQJVCPhTFWZDujvnDC3dK2HUIJNp7udQWXeTZ?=
 =?us-ascii?Q?UDLvFbWaubl9119CJsqevOY8RgqIZ9S6AAEyzMkQ+fkjPxp1FxFsyKfE7up+?=
 =?us-ascii?Q?Mpym4YmDUOJHUhzwlzaD3b8hXB80sODAqsuj0a9LrOTnp12JLn9x7gH7VU7G?=
 =?us-ascii?Q?AyjiZXe5sQbcZvNhN12hPp0y0REgGRYJdYGGn7KYIf1c5eD2e+YmNoSP0eoO?=
 =?us-ascii?Q?OgWhmXIK7UkkHBiCdEb8bLucr/GSe4tG+u29eaH6UU86X3oK1RpBHL/ea8P6?=
 =?us-ascii?Q?Udj7XANktBqxinUyk543ufaJJA3wmDINLKHq5M8rguivzvu0zk5NPHeUOvyH?=
 =?us-ascii?Q?MXkzOmuXsCIs9nAcPORUA27uYgjLZ87UAagXMKGenYlEBpZPHbj2whb62ms0?=
 =?us-ascii?Q?ToSLQZNkmddM8fMejBLOQ6nR673F5kHA+XxDPDG9X8TXeTAGRTqXgjQxyMMB?=
 =?us-ascii?Q?6Dq9W6lnWmNI2xvwJKn1dCvQPnvKTZ+hx/jG5CPIsiG9IV+gPvFdAeyrkDzg?=
 =?us-ascii?Q?ibUNQ9ikq38FXZeBGRBgqem7F6iTuAS3A7FCR1xL7/H6qOJmVuDprREodW09?=
 =?us-ascii?Q?NeTppNxUWLqniBYuFPeFbvyj2O41KfFPshbA5EdFwixPR1YMOIgBNq4RhRb0?=
 =?us-ascii?Q?ryhYIec34HseftDZ2ac6H4gFCKkU7QhMZDFnMsOrljsNWm/myZ4/pyt5Ipj2?=
 =?us-ascii?Q?mMy2QVEpES8XWTfXSPre1im5rcThnRaBr3ov5VdVhM4kHV9Ykmss0npqPIsL?=
 =?us-ascii?Q?ejwIdhdWo4fnujgYQCdzP5lGHiVOlAxtDnyduWco6B3/Vk+Mh0slQzfvEutX?=
 =?us-ascii?Q?1KbPSmtXTYJfT4ag6Lkcohtdma+3aLuqkc2ISQqWWGnIpQ/2AarNlSWUM4zW?=
 =?us-ascii?Q?79hgu8Jk9hFjh8sjsy2ggOGEkfThgHql38F/suRZIUkDmu85oku9ALaHLbsc?=
 =?us-ascii?Q?ZN9/zj2DD2KWeyJ6oUp2i7eifDoJoyFPClPK3K+OZJorf81efdqm+D0FE9NC?=
 =?us-ascii?Q?zwMAUTDdCXhrtZqCaO0DS+uVunGdSVcpiZz21UqOQmo0GX1fv7+rTEofOAKV?=
 =?us-ascii?Q?jwtGSaC8JIfZ9tcGDcVtWRS2LAC0sFd5s5fSmozBvzrVSgTOING4WZF/6MJD?=
 =?us-ascii?Q?Ei0ZrSJqj0t/Omt6sNm0DvytCCrbq2kH1IzUwEhpxaVC2f9PtLM/18Y6m3sZ?=
 =?us-ascii?Q?Yr277/NXLRQU23q7IHYD0uYzVjgHKXE6EuPje2rdGB0YpRveFFxJE9UiIAiT?=
 =?us-ascii?Q?O7aFoaR7XeaYf7BITexuG9Dnxw5djgt+5pMHjgec?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a297a239-6e34-491c-fef5-08dbf4e34ef6
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2023 16:08:52.4875
 (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: 4WT6ZXki8n3zg+fyUngGpN2+dRd90lSYd0+rKnE7uOYK72/KQsk0jT6f61yaIb4xPQSPc6fvd/tyUyjV85YEqw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB8057
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 fry.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 (fry.vger.email [0.0.0.0]); Mon, 04 Dec 2023 08:09:10 -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.

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

Notes:
    Change from v4 to v6
    - none
    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