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;
From:   Frank Li <Frank.Li@nxp.com>
To:     mani@kernel.org
Cc:     Frank.Li@nxp.com, allenbh@gmail.com, bhelgaas@google.com,
        dave.jiang@intel.com, helgaas@kernel.org, imx@lists.linux.dev,
        jdmason@kudzu.us, kw@linux.com, linux-kernel@vger.kernel.org,
        linux-pci@vger.kernel.org, lpieralisi@kernel.org,
        ntb@lists.linux.dev
Subject: [PATCH v16 3/7] PCI: endpoint: pci-epf-vntb: fix call pci_epc_mem_free_addr() at err path
Date:   Wed,  2 Nov 2022 10:10:10 -0400
Message-Id: <20221102141014.1025893-4-Frank.Li@nxp.com>
In-Reply-To: <20221102141014.1025893-1-Frank.Li@nxp.com>
References: <20221102141014.1025893-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?4s/n3O+7cblwHqmrGFMtWWkhzEZrzAKpQLOYlX6GQW3WE+2ssG+WiSgDhsK5?=
 =?us-ascii?Q?4UPRxN48zs6mA2tT8UmL6nKjsw4npClvgnaDdw3JewYwyaC6sPotavd6UJiQ?=
 =?us-ascii?Q?EqeRm+JhBz3LevgLuf8IbQgwJXZlK75aEOOUrcfYPQFaOQgp1x6Oiu3WZ50g?=
 =?us-ascii?Q?KihMSNrqnP7vgfLHlSd4RY9NUQjCOs6W7qWsjdlgVK0gbcxv4n4+L9dW6Mmg?=
 =?us-ascii?Q?fF2w7SrDGblmdKnP21dqYwp6F/pMeKlwM6RPRbSVVxrfvZV534zzBMcXFOrR?=
 =?us-ascii?Q?6MM0EGJ3g3KMuHrtg/p2569G5flMaUXwQkr5/RU98R94D7KfASqKkyz77Ti1?=
 =?us-ascii?Q?F4xx8lVV3iHaW3Onk3/K7yR0Xees7kQ8XsvP8podN/7ndL7AMHN0Tv9/cM3O?=
 =?us-ascii?Q?peM8r2xTFLyce93rfQeCPqyEtaZgzaYg8SYP6FKJAnK5tqliTuhaM8qUUv+Y?=
 =?us-ascii?Q?Nz+/yD3N13Vqa4qiu1RCVnD2NlTv68TGIcjouYl/i5yPsQA3TPQ371aXttwf?=
 =?us-ascii?Q?1O+jppJE/A2V4n5DmyB2mHbgWw9YxNQrLHcpIB/nrOmWNDutlAaOAWbmnWyU?=
 =?us-ascii?Q?fnxjgBfe31LRG/tNOZDV4z38ofLDjEnui/4wc8azPYzCzEZv4KW1pct0X/AA?=
 =?us-ascii?Q?Y/pV8otqqSbTkxMI8hJ8pg9Yhv8mZb66XX66V+f/zVwGVI5LU/es9ccVFKGn?=
 =?us-ascii?Q?t54FKXmBN3Bp99A5rypMQD4zCPbbb1lJ7D37iaugagSeTgFqoijObLYOTgUG?=
 =?us-ascii?Q?okGtGrRWuIXjhrU+03lRKqIPRFXtKMzoeIM8i+9yJTlVeYpvpI7u7WaE7nu+?=
 =?us-ascii?Q?Z/ajCbMT0XlJw5176G8gX/gDXsSlO+fJuE6Xd//fUcVB6zdn3ku3gzC61hwC?=
 =?us-ascii?Q?7uZHobLg1cS7K4xdCXuntu77mVZRrOjrGVK62gyG8+ffRJjr7zJn+rXcNxLF?=
 =?us-ascii?Q?RNZiThDOPmSFNP8SNgnMCecR/VXs1U76mtzbBZ6wo4PImnV0FAHlgyGEXciN?=
 =?us-ascii?Q?BocE+m2JeCreHhQSKrmrSKzH0TpWUDJe9aPK5ILlEGL7cIEFm67PHDJnA32W?=
 =?us-ascii?Q?Y+fkFrdSGnQOP7ak9CupHd0PbXeRTxPP2c9cf6FfrEOfEWBGzdoac0kLqgpa?=
 =?us-ascii?Q?0TcxP4YVRkeLdttZGJzgrR45/4DsoXVvVB1Cdu3gPPSozjrejrQjD250aa/h?=
 =?us-ascii?Q?lG5nllCCcKgG644oZ3wgAh32m2aD8ljykHEYf+2UKkGoyg5uQYR8RpmbyRrt?=
 =?us-ascii?Q?WrRmd8f09Y7NZAF99cDZggePqFLs3SYw/V/NtJSIrve+rY/x5dnvYZUoEq7U?=
 =?us-ascii?Q?VyYJ0hy0G8vyq1T8XNfU8ff5Zu5p+u7pvolRyESLprQkGTP59cmwF/X8TVoK?=
 =?us-ascii?Q?qF55cs0ROSM8L2Sr/pmwgcmacN9Vc4DBq9+FW+UKs8mMGiuefgU8hlKiHPHO?=
 =?us-ascii?Q?eI9SHQMaQ3EChKhpkYDCbRzb6kbuwh3+vmAjq3+pAlDAVkLv/bYX61dz/mew?=
 =?us-ascii?Q?r08q6JTOOUeYM19n3jEiSHLZY20lfN+2gvoqdDYl0GykJQzU/bT6H432XhyH?=
 =?us-ascii?Q?9efgy7aVX7U5PoLBjncMsM9QWf1+1noIxPBfUO+h?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ddff5be1-4526-4700-48ef-08dabcdc085b
X-MS-Exchange-CrossTenant-AuthSource: HE1PR0401MB2331.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2022 14:10:44.8654
 (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: ZhCXwUja6kcKqUwIxFuOmbd3NrnjQAg6j0vfIO80iRsJJwqGdxOmRnyn/BUQ80vqFB4goFisW3hsf5wic/Ph3w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8234
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS 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

From: Frank Li <frank.li@nxp.com>

Replace pci_epc_mem_free_addr() with pci_epf_free_space() at error handle
path to match pci_epf_alloc_space().

Fixes: e35f56bb0330 ("PCI: endpoint: Support NTB transfer between RC and EP")

Signed-off-by: Frank Li <frank.li@nxp.com>
---
 drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
index 1863006cc36c..191924a83454 100644
--- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
@@ -571,7 +571,7 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb)
 	return ret;
 
 err_alloc_peer_mem:
-	pci_epc_mem_free_addr(ntb->epf->epc, epf_bar->phys_addr, mw_addr, epf_bar->size);
+	pci_epf_free_space(ntb->epf, mw_addr, barno, 0);
 	return -1;
 }
 
-- 
2.34.1