From patchwork Tue Nov 1 16:57:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3087761wru; Tue, 1 Nov 2022 09:58:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/J2ptUXksr3upvUEqUzxuGzz9tBrOHXtAwfjJBIrq6xO3PpwzNYbkvEZahFLCzcS1KCWE X-Received: by 2002:a17:906:4fcd:b0:78d:8059:17c with SMTP id i13-20020a1709064fcd00b0078d8059017cmr19238497ejw.423.1667321937781; Tue, 01 Nov 2022 09:58:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1667321937; cv=pass; d=google.com; s=arc-20160816; b=pPLihQyZsLTTOSHB2nk5XaDxcEsPhS5PD4n5K7jEBjnkrG/+tAGu1GJr94+X9m4frs A71xIfml6maWi7qGEfQ/YZBeV+wjTLd0gqKjWIWTgy87zJwrpGeUHFvvL2XuBeB+vWdm NAaAKzgOEE6LFAaUDUPthkYyEniNXYoHGoSK9+73x8+8Ra+mCXNe5EMGAmMhPhdNqVJz DgLN2DM6d7rAdoduG7yf4e58tQ2opIvuP1+HpqD3HBqGJnPYtOZ8KKAGmqnvyKKJtuMq 4PwSvkWTVMK2yuapOXyjk8utXry90v2NNuLp71t/VkvFMPlzJ3Axf9eFWbEFvjbVr5ad 1IzA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YRK103siZ5945LFLHIFILLE1HOlBh4/xZcoINeMqjBQ=; b=OxRca1ACs0jA0jrA0rV35WI2SmBIrcz8SMPOe7qwPV2TrDHBXn6DXBE/HWut5Q5XBP NdY6DtTqPfTB04Qwq/1fA6RY97elatDYcfDTEyT8GzXFEE7XKLsRj0hQ/IaLxnpy9//A wfvsGVptCvG8WnN09czcs9Ng1lUsU3fzC7afFp0vdsSnmQo1RmfPCHZXYIupGurvri49 qT+qJ8tDw+Y517DuEaoLwlqyxxyKj6n5ecdGZQXWFQwKKRbLF0BBQNqg5ov6aJZHfI9n woyt/D2TigKu9ZdNnUXMuMBfut51jbIF90H4LhUADgo+d/xY8/tqLvrailYNfRfEjAp9 8Fiw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=O9IzxmVb; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); 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=nxp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds15-20020a170907724f00b0078d1e610b3esi13119992ejc.26.2022.11.01.09.58.33; Tue, 01 Nov 2022 09:58:57 -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=@nxp.com header.s=selector2 header.b=O9IzxmVb; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); 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=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231309AbiKAQ6B (ORCPT + 99 others); Tue, 1 Nov 2022 12:58:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231191AbiKAQ5q (ORCPT ); Tue, 1 Nov 2022 12:57:46 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70047.outbound.protection.outlook.com [40.107.7.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA4041D0FE; Tue, 1 Nov 2022 09:57:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mU9lgzfdsGWg4VgjwULe7hSVBL5RQgAq7uGFq0lihRtVTCrBY2ZTrnBfaZ0wbaPVyWn/yF2V6gWtMUL1fMnmM4RwN2aSj3A6h864KMx9x6Pds+eXex9U8rq/cHp+kbnrgo+MPH5TamTcy/KVwjrRLm9dOuJBYCWWR/5nT0sIGoqfnsQrmXMy/Lk9OEeVO5/hun0blXH0NClHvVfOhVJ9GGtyXZ/8P/vyU2KTeMaLG8vVpjY0MIXwTy4oo89cCUIGYmfYexJYlr19HEEbxCVCoN7q2CTuQM/L3nlQBiL5GjnUSrPVfb1PEKRDRIQ7HAQuEMHb4c7+qy9zN2Rgu+rrNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YRK103siZ5945LFLHIFILLE1HOlBh4/xZcoINeMqjBQ=; b=A1YV7cjQZwAnPEVuy4TUREunXISpicstprDxThzmty/9qnEiVjaOB58wKAW822EZkvQywIrvgSifFN1Cpxsfs317b0tgjPMRglkThTVvgu6a/x0aXrB4bQii9rlZl5stz4BEwpGcNHEsgY00hdy5hJqfZfLRfplQczHKcZEgLLhw5VtErw+jPRfBBXsG/4Hbl6+ag7BOQhPARQn9TEyHP0YYWcJYiQZyN7LCGXE0VwJP3+fpv0TQmwzsYaNzgYvLTkZ5KR0HVO8ASbVURDqLYEuWYkAKa0mkPxvLFn+V6F9qGYij3rs1TKSjt9LFpalmyRL+mDCWY0iwIfcFFKbAdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YRK103siZ5945LFLHIFILLE1HOlBh4/xZcoINeMqjBQ=; b=O9IzxmVbQh7Fv+3qZio7XVm+0Im2jkwAy0Xs2emQgH/KvFi03lTZGjCiknRfiMH1hN5nzVWky5/7xoEbSZmzdVq/63fmmJvTd7NSJcze+Wnq1sZu3Qc5y8jW54fJoc6ZPPWk0JIXQWwyEFtDzCH/c3o6xBt2KXnMaB1JHmkdkhE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from HE1PR0401MB2331.eurprd04.prod.outlook.com (2603:10a6:3:24::22) by DU2PR04MB8631.eurprd04.prod.outlook.com (2603:10a6:10:2de::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Tue, 1 Nov 2022 16:57:41 +0000 Received: from HE1PR0401MB2331.eurprd04.prod.outlook.com ([fe80::44bb:8387:8f4b:6a28]) by HE1PR0401MB2331.eurprd04.prod.outlook.com ([fe80::44bb:8387:8f4b:6a28%11]) with mapi id 15.20.5769.021; Tue, 1 Nov 2022 16:57:41 +0000 From: Frank Li 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 v15 3/7] PCI: endpoint: pci-epf-vntb: fix call pci_epc_mem_free_addr at err path Date: Tue, 1 Nov 2022 12:57:05 -0400 Message-Id: <20221101165709.983416-4-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221101165709.983416-1-Frank.Li@nxp.com> References: <20221101165709.983416-1-Frank.Li@nxp.com> X-ClientProxiedBy: BYAPR05CA0007.namprd05.prod.outlook.com (2603:10b6:a03:c0::20) To HE1PR0401MB2331.eurprd04.prod.outlook.com (2603:10a6:3:24::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0401MB2331:EE_|DU2PR04MB8631:EE_ X-MS-Office365-Filtering-Correlation-Id: 50dbc345-2f14-4640-ab66-08dabc2a303c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Id6iNBatm8e8n2StFNdUaqWO3ZJngyTYzeeKOTn2uSv2F0rJIfrbWfNmsj0vxoHmY49Kp1hwUNXsIJh0OkJxgIlle/FxQyEjjmWm5HYWhm2qdRXMspVpuE57koGeXpyGueq9mQptEpg3IxOBydKKSlwX/yxnwCGiCP8uPPtkVaSn49h//gORs55Jxn9f3Gy/8UcerKjmnfzz4F9cvPYZJoDZbqqWAhm/Xqu1obhzNRD1lkm/0WlbKt+UoOzzo1ODdjDdToS5Bw77TfoDryNf/lyep0928/JBe6koQAUZf3BfLGtiz4v0xRsycwjxV2KqBAA3WLt/wWI9buJjavP+UtegNu0iFPTeFWHqDBXY0Rh6kVEhw1YoGpmJERjE3r6fwSAM8eVrw0wd+11bgaaaTgQlMhYyOxgmXS5Hpg703WfVVRbeRynjZ6KdTfRIHDGTb7Uv8stYfNBLpoF4VNLN262fogo4SOeeP/YmS31q+1AS8FgEmifGoWTC0wNVbH9l9ZZ+/RtN29umPuZ/IB4etiJABPAhmeMNOyxOCnKHiC28djMv/mx9Tj8R3rfLFxBqH77IrHkyDRj+iXqJOGJgMKfDvObGqp5+E1F4CwlD4vKXSWTbyrDxG30s8rD+sxC4HDuqLwYv07MC4hC9pe3gH/OimZLHwzDD6JlpSLeVqUbUIKEmr4fg4Z5IO6XTIbNZw2S5JAdQ/Ltd/QgkwkFyYkcbexMQMRR9BAqUJAE70IWdOm3k9TRM+XKgUFeix4rkv4COavWHvw84rsTXT5zfog== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0401MB2331.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(346002)(39860400002)(366004)(136003)(376002)(451199015)(83380400001)(36756003)(86362001)(38350700002)(38100700002)(6916009)(316002)(6666004)(2616005)(1076003)(7416002)(4744005)(5660300002)(186003)(6486002)(2906002)(6512007)(26005)(41300700001)(6506007)(8676002)(4326008)(66476007)(66556008)(66946007)(52116002)(8936002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KTlWXZYoVekw3ZMSzgmHQ48HdLvBzwKdcJ9oiLp+CggpZ+6X7UYvqZice/kw2AQCVei2lh6gP0Nsgf2A7ZygSzrPkcZFPy8Rf2W54y55mqNPKZkLe5SG6flM75Uw0/UBchI6YIUQ5YrFqIxyWMqLkNls4BVH88YOkDeBgfK8WQXkZFsCQc8MCQXq1WhB8ksM7li7pt6BuJKJuASUCfifSGqRxw5bqUwYIkXz7aQiKMUa0rupQqfgUocKN54C3AMKkdOAfRXgVsNwbMAKR++ebf27nlD2jaXKHnN5a4XUXuyDJG/dhj6E91LTy1fD9gAOqvCTsvNw90kesnAZU96OxC3T9Stl76TL4Havx8qCFs/Bo05mMDmEF8bsF95B6K4mewW4zomH657JeRwJ8WpPnb6danPAgR+yKAj+jimRF+cpMkvYBxeJrGtzsABHPVVc82F/XWXBhSzSMAjTFgtmBsl908VU68YhqT/3buWnfCmmUPtW9dmmMWRGfL8a9u8T3xm7ctZZNhG99EB6QypqLoSZYSJPKJJI08wylNmKfNAPsSyjFl7rs9JAIUirhOp6qEqcUrmU+S3Zty5zEUMnnpmwtulZedY38+gvGoya8DVqSjyfg2mcr9QNv6R87EwRtUTckrRItwnh12WL0XIJgl8zFmDRSyH5q6OEOr7c/paJ70amlBi0Y7hzFtnj+sUjzSqwDqU9U1Y0dyk1EG/WQDjPvzkKjAsLb/HFLFnfRoY7mu3tCYketTb3T40wyB6sX3T/VAMecrs8FJEyP2VxsA612ldt5MRLLDJyuMbsgqLiITze2J/73N+7BCyYAUV+U40gjEtX1MEY0jK0jdoZIhPe4CcScwA/pxzCHyrmwzC/JP41YSeShNRhKd2HoQoQHwPmlqgYmI5Wh5Zt8eYtBswgcLVZ9rP0vyTp8WkhvAgDu7PoRdyl60xJ65oZ09D7ahIjTyMwWcuSZlBS72PNTjLKHlbSsSAUwPDfhmUYhUsV6m4FOYELxJhJD6VWRlN0olBYltAdKFK8iQnkvK0W4wT/d4BMxpzOTySNp4gcUAA7YrXcWYeNfKJnD67jue77MMYSBNPlWUTHUizLIGqRaZidBMrLu4ye0IoVlshFupmg/3h6Rew1Vm6CcXK/goGV6r/PcTY/8fbT6VfiCCKbJ0IWDfFZLbQpqQ6An7xrJHmFOSxJT+PF90CKN3StnDLy9cE4LVt7F2XVsmJIaU6ZQphNh+EUMBEYcE/lWZ/yrBIUKO7V3NL6szQoBLC2qmPEp3No3QPYwPDM7XyQe3r80V7y9GGBtBmtTREzj0lUFXg9LA/muFdZvsdmcNjMM84evMznHJRxwz9Ln83sYOVPUja7ZBpkMH9HBoL2OmAVBBSWC/QnxjDUPCSzAF3gBmbia0jUC5HzSqMZsBdmtxHKbAAL5GTe/otguJyGZ+kapInOEpKKW5Ct76KWsf4uk5Qo99Gtxyy5lFX1SdreRGI/pB+64l+6IJ6JV6wsoQmvNXtY0SKPDGOCphXSvZiD8/XpUjGaMEw3vYX31Ba7nrDLIzL7nJ1j78p/enohNwSl3mx25AYtR43SVf+whnO75HIP X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50dbc345-2f14-4640-ab66-08dabc2a303c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0401MB2331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2022 16:57:41.3558 (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: ZyKXj6qYoElIxGiuVbOePHVHLfdwHBzKhv7S0o5ty+41qNx7zklozSI0Yt68Yi+xIxJGiqEFQLyfem/oTozogg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8631 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748313768018265766?= X-GMAIL-MSGID: =?utf-8?q?1748313768018265766?= From: Frank Li 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 --- 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; }