From patchwork Fri Oct 7 19:13:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13001420 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9691C433FE for ; Fri, 7 Oct 2022 19:14:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229707AbiJGTOR (ORCPT ); Fri, 7 Oct 2022 15:14:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229452AbiJGTOL (ORCPT ); Fri, 7 Oct 2022 15:14:11 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2048.outbound.protection.outlook.com [40.107.20.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0E78A98C2; Fri, 7 Oct 2022 12:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHmSr6/OvU4id/Zw1CLfWePVINOVWT/RDZ8fKpiZT2gCjooxfXS6qEiQoF1M2tMFBBzWcJHTImP5Celr3HB4iAl0O+AjpZUXIKGP2EoMs3GLQg2yFv8yAe6iD1PgMqJPtt1e0ccqq1UrAEUrIqBRokQTGmUSYIukyqPXACpsBnG2VGmexcwsjKHxtBgnGKCWeJJCGUB1zfGhxV1bC+otqVWoK30kH2I1LxFQs1BEnLsVS9ijXH2foaD7SS1Xsr1nKNT37W6ymPdyGoVy4kxWx2EhdX4fiIyxOL9E8yk2bZNwyHSnpru1J4ZDhYVf/e/oI4rw01t6tsH59EnpLc3Feg== 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=ztuGq2FTvBPO9qE1epwO3aSqJAJQbfBz/Tjg3yJV2fA=; b=FPo8sfM9UBP1/v+jqZPur7PpB0kF3zcIazgkEX/GIKBsrHum3aNGMsBAS5AU/15cIwgzgAFEo9EeKvYgbQbzxXdN1hdjj6cgRkdyk7oNecTv+L8Xqh45LyvozSRTprO8RDs2sJuzWfQs3dh5Xx/VwyAX8buJnZU1JGs5E7ZiQiQijZT/oE7Hpn8pXYdZN2Uatyfd44Oq6SOgW7jdOOyKDCGfYuFvYICJ/RRqG9YQR447DrbiQc1TOSlxb/iA9hYiDjMAFraxuAgm7yr6Z29/7nivIGCaUbO7xgGMPdtH2MdPoqbppglO1jdcsMiz+kCjWstF6YFhGkUFg5jWcdVJhQ== 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=ztuGq2FTvBPO9qE1epwO3aSqJAJQbfBz/Tjg3yJV2fA=; b=PW+E7dqb4ZrM7Ot/oj4CxYb19TJPYGXNjDarNLBCSoWB1hhkiubNM3rz1AbZ5TgRaYjAn2TjZKt2KIelWUqrcoeq3Cuew57soY2tOpbdLpD14TytZ/nSgIC2RFGZDXED77VJk2YFcBeWr3ZIaQuwS/W6Gt+meOlGxJJOoK1M3F8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) by PAXPR04MB8192.eurprd04.prod.outlook.com (2603:10a6:102:1cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Fri, 7 Oct 2022 19:14:06 +0000 Received: from AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90]) by AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90%5]) with mapi id 15.20.5676.038; Fri, 7 Oct 2022 19:14:06 +0000 From: Frank Li To: imx@lists.linux.dev, Jon Mason , Dave Jiang , Allen Hubbe , Kishon Vijay Abraham I , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , Bjorn Helgaas , ntb@lists.linux.dev (open list:NTB DRIVER CORE), linux-pci@vger.kernel.org (open list:PCI ENDPOINT SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v13 1/6] PCI: endpoint: pci-epf-vntb: Clean up kernel_doc warning Date: Fri, 7 Oct 2022 15:13:21 -0400 Message-Id: <20221007191326.193079-3-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007191326.193079-1-Frank.Li@nxp.com> References: <20221007191326.193079-1-Frank.Li@nxp.com> X-ClientProxiedBy: BY3PR03CA0015.namprd03.prod.outlook.com (2603:10b6:a03:39a::20) To AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8793:EE_|PAXPR04MB8192:EE_ X-MS-Office365-Filtering-Correlation-Id: a54446d6-ef57-40b6-d7c3-08daa8981a7c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qc+h491u7qLXfPp/n25Bj8S1NVpjI2i5uGZcMK8jmQ22qSt/hx5YxegySEfRQmPzKFdfCdHZJvLq1prK8lyfvkuSiuXi4rrwSP6z9T9xRFudZeiNkg9zTEC9ulnP3p+2P8NQJuBpdSUuLwt2JhLLoeo9yecXj9UOfmnhFUq3CpE1K8VhS9v+E26OGOOT/cKg2o3tjnM0T4xTn9yit9S45BV1FCC9Vmw3IgHARF7MRTlBDN0eZ2waBSNSXrXQkLUYZ+EqNXH2QyJQGbOUe12O2lj3t7vLg05hMe0K9aY8f0GB6CaK0mGsXDDgqIlVtUarD2CHReHkwGbu966nyfYThqdZEtVpcoB2wePCa+zbr7u6urkT1tzJf/iesn2TCkpV/g6jb/GISRkxo8facfEx5brqbqsdX+FmWaqckQNdAtOz6nCglcEVxlCJAbzEqGB1Sw47mbwusuSk1hLC0aNrmg0oWBWVAvbbT+pfQiU0eVlss3n0NvXNpzS7K69Bzj7aUXivVrunfNhrAnlcw2iwt1z9L2qMxSF1oCepsVbfhALETc76EIRDp+dxUbp4IkSnK7h2jHZZrbwZLV+Y8uEPuvDfSkoQ7uzuxqpCur5+VQk7E0x+HrAjhGYEFu5VvdgUKbnpq03T50GLyrYpPscStJpApALI3N6nbQxX8IjnDOjoVTnupcFzRhBspKlx/BFG12Ge/Txm6T8uEm7EAuGIZ+UoU0+GZ/kYawK9wM3ETOK55h1vxo34DNX2QvXwN33cJ1QI80zX83wsKzFkwAfn58xHP92cy8w41AYPM/0Wyb0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8793.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(39860400002)(346002)(376002)(366004)(451199015)(66946007)(36756003)(6666004)(7416002)(30864003)(38350700002)(8676002)(38100700002)(2906002)(1076003)(41300700001)(66476007)(186003)(66556008)(83380400001)(6512007)(8936002)(2616005)(52116002)(26005)(86362001)(5660300002)(921005)(6506007)(6486002)(110136005)(478600001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1TB/6/nNHCvQDUriav8Wai9u1S0pNwLp6Wjosck9AsRS7Rcn6cLLGv3BrG8gzA2OS9bu33mmzu4s0ZBukpaEpQyTlD2XlVA2y0wpEXYT4GEYgKD2SyXkJbDZH2f2xYs0NBVEZ8qt6AmxexI5hyh3pRIs5RMslQSe4Z7oQPW46R5NIJYNNQNqxHonJhsR5ZT7bmXKNepPPKhIKnsNsuQQv17SdG0QJGAuy4BbLBaEVGXJwb0Iu8BCBl5lcdiZHyOLDMzx7HwwzyRueLXc+NHon0SQH4vzRAhODo9ZGDnX9UbvrUPFDlNg+Wq0COzt8sRm32Ltsn+7qXYBYmJ5oG8advDWzXgNY4Ese2+j+LRP4KoAhIM418K4rcsOe+lvT52s51uCjDsKi2i8UBmmoYCgewCGpLYAE3BOQPl3vUCdOJhOffFi7UmlxaIwe3OZp9lR2DbZ5HTPVFZsFSGBkf8PuoM6xPzpOMXdFjWqrq78QzmIZY3zUPbsLXwAAuCc0D3cxP9lJkDbKO8DCLBm1YOCtD//RQ8A0kw03T9EwFRTzTSrdxz1J1k/arTm28bySywsVxvVHG/Gk2akOSAtXK+svW+ZEs8Qvsa9DZvVYi8H5NEiZtj1+I23e0dz7ym2ML+2A5XQAX271459ROHwR3GAsvcRZ/iLsYjhwkWbBOUXx1C91AoKJ8Dij+M79UMB18QQrciJ7mWBYU34oulRwrn9YAfJFDF0BcHERsgIaOE/TtoXyrfhLn2tkgEwjS3j7MVWZhSHMBcZEeOAIsuiTFa36a1R/c+ko1zoTs5/lydQV0cPPpSg3f2fWZa7EGG+RNndpavmQsViPNIr8Mo0FJUGS5/Ci0rT3rATK7VSOvUnCNRUmmDc5OhOSQoMfcmSQBR4+K5LZCpJsXTK8OGt8Rdwt8NSJIr1zlq2eoRyT2rXyks9KUprteIib6wLZupeUDlIzP7fSAfztBUyfJc82DhZ5xxb2/cnRW8TrXHABtfzE+ajOPKFZJ0z9oAwID6puD/xH5WxpL9FUFx5WoxJJYBcq/gVA8Tm2PTvpYSNHv93lLASFqnDTBfXXmK757Jry1paAecbcH7LHvixjDDPfBWrRApF5GO44QWQP3BXn+u6SvpzGtBEdSrPXBj2+uW4xyh5zFJ2K7JxTBFdXU+fl1+uojML8nTL/DbAEJg48K5vsLzHSjCCeu+waBUH6AIdbIVc8n7QO6JVHuo/1jAoeTwZCxa3kshFJ5XflUJ/r/nCwELdx91wvTnysZp+VOUQxd9lgEmo+ZHUqBW/jZbSqZVoHpZ6P0YnIvGRZdhBfXi/IWOW7py74dHuddDdVFe03UyB5UPnLSamYlAozJ6R6OqvrjdEmYoPx5oAvrlhnZrfuv33UZVntlYcz/1yLH7M+muETy143mOvafArrVl13+loKMb5FN46lXT817CZJxsoNDwaeEhulQ9fwbq/rxlfyQOh/2q88/NfR2c24DuSwBx7yS2H3Gqctykb082/YCv+qhODQz08F/TQCgkHExfrTnbox291HCy4PALwuE/vqxEt0Nig4BHcnPJ8iIk/jQHZhjEOWYdVvDECufrR6BMKXx7D X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a54446d6-ef57-40b6-d7c3-08daa8981a7c X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8793.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 19:14:06.2299 (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: 5+TLgLDLrP2auykPfFpIlfRrsRNPu5OsfuFX+YlmEg16yYCCVs9L0K6C+BodGiDiQK6E08PyansRMUzN2coX2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8192 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Frank Li Cleanup warning found by scripts/kernel-doc Consolidate term host, host1 to HOST vhost, vHost, Vhost, VHOST2 to VHOST Signed-off-by: Frank Li --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 83 ++++++++++++------- 1 file changed, 54 insertions(+), 29 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index 0ea85e1d292e..c0115bcb3b5e 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -11,7 +11,7 @@ * Author: Kishon Vijay Abraham I */ -/** +/* * +------------+ +---------------------------------------+ * | | | | * +------------+ | +--------------+ @@ -156,12 +156,14 @@ static struct pci_epf_header epf_ntb_header = { }; /** - * epf_ntb_link_up() - Raise link_up interrupt to Virtual Host + * epf_ntb_link_up() - Raise link_up interrupt to Virtual Host (VHOST) * @ntb: NTB device that facilitates communication between HOST and VHOST * @link_up: true or false indicating Link is UP or Down * * Once NTB function in HOST invoke ntb_link_enable(), - * this NTB function driver will trigger a link event to vhost. + * this NTB function driver will trigger a link event to VHOST. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up) { @@ -175,9 +177,9 @@ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up) } /** - * epf_ntb_configure_mw() - Configure the Outbound Address Space for vhost - * to access the memory window of host - * @ntb: NTB device that facilitates communication between host and vhost + * epf_ntb_configure_mw() - Configure the Outbound Address Space for VHOST + * to access the memory window of HOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * @mw: Index of the memory window (either 0, 1, 2 or 3) * * EP Outbound Window @@ -194,7 +196,9 @@ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up) * | | | | * | | | | * +--------+ +-----------+ - * VHost PCI EP + * VHOST PCI EP + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_configure_mw(struct epf_ntb *ntb, u32 mw) { @@ -219,7 +223,7 @@ static int epf_ntb_configure_mw(struct epf_ntb *ntb, u32 mw) /** * epf_ntb_teardown_mw() - Teardown the configured OB ATU - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * @mw: Index of the memory window (either 0, 1, 2 or 3) * * Teardown the configured OB ATU configured in epf_ntb_configure_mw() using @@ -234,12 +238,12 @@ static void epf_ntb_teardown_mw(struct epf_ntb *ntb, u32 mw) } /** - * epf_ntb_cmd_handler() - Handle commands provided by the NTB Host + * epf_ntb_cmd_handler() - Handle commands provided by the NTB HOST * @work: work_struct for the epf_ntb_epc * * Workqueue function that gets invoked for the two epf_ntb_epc * periodically (once every 5ms) to see if it has received any commands - * from NTB host. The host can send commands to configure doorbell or + * from NTB HOST. The HOST can send commands to configure doorbell or * configure memory window or to update link status. */ static void epf_ntb_cmd_handler(struct work_struct *work) @@ -321,8 +325,8 @@ static void epf_ntb_cmd_handler(struct work_struct *work) /** * epf_ntb_config_sspad_bar_clear() - Clear Config + Self scratchpad BAR - * @ntb_epc: EPC associated with one of the HOST which holds peer's outbound - * address. + * @ntb: EPC associated with one of the HOST which holds peer's outbound + * address. * * Clear BAR0 of EP CONTROLLER 1 which contains the HOST1's config and * self scratchpad region (removes inbound ATU configuration). While BAR0 is @@ -331,8 +335,10 @@ static void epf_ntb_cmd_handler(struct work_struct *work) * used for self scratchpad from epf_ntb_bar[BAR_CONFIG]. * * Please note the self scratchpad region and config region is combined to - * a single region and mapped using the same BAR. Also note HOST2's peer - * scratchpad is HOST1's self scratchpad. + * a single region and mapped using the same BAR. Also note VHOST's peer + * scratchpad is HOST's self scratchpad. + * + * Returns: void */ static void epf_ntb_config_sspad_bar_clear(struct epf_ntb *ntb) { @@ -347,13 +353,15 @@ static void epf_ntb_config_sspad_bar_clear(struct epf_ntb *ntb) /** * epf_ntb_config_sspad_bar_set() - Set Config + Self scratchpad BAR - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * - * Map BAR0 of EP CONTROLLER 1 which contains the HOST1's config and + * Map BAR0 of EP CONTROLLER which contains the VHOST's config and * self scratchpad region. * * Please note the self scratchpad region and config region is combined to * a single region and mapped using the same BAR. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_config_sspad_bar_set(struct epf_ntb *ntb) { @@ -380,7 +388,7 @@ static int epf_ntb_config_sspad_bar_set(struct epf_ntb *ntb) /** * epf_ntb_config_spad_bar_free() - Free the physical memory associated with * config + scratchpad region - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_config_spad_bar_free(struct epf_ntb *ntb) { @@ -393,11 +401,13 @@ static void epf_ntb_config_spad_bar_free(struct epf_ntb *ntb) /** * epf_ntb_config_spad_bar_alloc() - Allocate memory for config + scratchpad * region - * @ntb: NTB device that facilitates communication between HOST1 and HOST2 + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Allocate the Local Memory mentioned in the above diagram. The size of * CONFIG REGION is sizeof(struct epf_ntb_ctrl) and size of SCRATCHPAD REGION * is obtained from "spad-count" configfs entry. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) { @@ -465,11 +475,13 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) } /** - * epf_ntb_configure_interrupt() - Configure MSI/MSI-X capaiblity - * @ntb: NTB device that facilitates communication between HOST and vHOST + * epf_ntb_configure_interrupt() - Configure MSI/MSI-X capability + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Configure MSI/MSI-X capability for each interface with number of * interrupts equal to "db_count" configfs entry. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) { @@ -511,7 +523,9 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) /** * epf_ntb_db_bar_init() - Configure Doorbell window BARs - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_db_bar_init(struct epf_ntb *ntb) { @@ -566,7 +580,7 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws); /** * epf_ntb_db_bar_clear() - Clear doorbell BAR and free memory * allocated in peer's outbound address space - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_db_bar_clear(struct epf_ntb *ntb) { @@ -582,8 +596,9 @@ static void epf_ntb_db_bar_clear(struct epf_ntb *ntb) /** * epf_ntb_mw_bar_init() - Configure Memory window BARs - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb) { @@ -639,7 +654,7 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb) /** * epf_ntb_mw_bar_clear() - Clear Memory window BARs - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws) { @@ -662,7 +677,7 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws) /** * epf_ntb_epc_destroy() - Cleanup NTB EPC interface - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper for epf_ntb_epc_destroy_interface() to cleanup all the NTB interfaces */ @@ -675,7 +690,9 @@ static void epf_ntb_epc_destroy(struct epf_ntb *ntb) /** * epf_ntb_init_epc_bar() - Identify BARs to be used for each of the NTB * constructs (scratchpad region, doorbell, memorywindow) - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_init_epc_bar(struct epf_ntb *ntb) { @@ -716,11 +733,13 @@ static int epf_ntb_init_epc_bar(struct epf_ntb *ntb) /** * epf_ntb_epc_init() - Initialize NTB interface - * @ntb: NTB device that facilitates communication between HOST and vHOST2 + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper to initialize a particular EPC interface and start the workqueue - * to check for commands from host. This function will write to the + * to check for commands from HOST. This function will write to the * EP controller HW for configuring it. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_epc_init(struct epf_ntb *ntb) { @@ -787,7 +806,7 @@ static int epf_ntb_epc_init(struct epf_ntb *ntb) /** * epf_ntb_epc_cleanup() - Cleanup all NTB interfaces - * @ntb: NTB device that facilitates communication between HOST1 and HOST2 + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper to cleanup all NTB interfaces. */ @@ -951,6 +970,8 @@ static const struct config_item_type ntb_group_type = { * * Add configfs directory specific to NTB. This directory will hold * NTB specific properties like db_count, spad_count, num_mws etc., + * + * Returns: Pointer to config_group */ static struct config_group *epf_ntb_add_cfs(struct pci_epf *epf, struct config_group *group) @@ -1292,6 +1313,8 @@ static struct pci_driver vntb_pci_driver = { * Invoked when a primary interface or secondary interface is bound to EPC * device. This function will succeed only when EPC is bound to both the * interfaces. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_bind(struct pci_epf *epf) { @@ -1377,6 +1400,8 @@ static struct pci_epf_ops epf_ntb_ops = { * * Probe NTB function driver when endpoint function bus detects a NTB * endpoint function. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_probe(struct pci_epf *epf) { From patchwork Fri Oct 7 19:13:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13001421 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45F5FC433F5 for ; Fri, 7 Oct 2022 19:14:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229728AbiJGTOT (ORCPT ); Fri, 7 Oct 2022 15:14:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229695AbiJGTOM (ORCPT ); Fri, 7 Oct 2022 15:14:12 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2048.outbound.protection.outlook.com [40.107.20.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 499ADB9799; Fri, 7 Oct 2022 12:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fm5eJ7cH1DHGOqioSI4Fblty0IIPNxTaFcpCVtroR3G5ktjxK/FkdTLaoIGbEP2t9mDyJT0SgrjIO3GsVX5hjtSgUxv9K6Jt4lxoJ3trpB925CQH5lg9fuVyoObqb/O9E19eJ0YL+FOmeL5+cCg/PzbTAal/VSf0Ny3CGylxGafXgz6k7IQGrlDf1eBeE9G1YJTP855x7t7UZ/hhO9u8nIt4aff8pwLJAfxBIfUBLIeDCcxK81cR4Yrg6Z3+Bbsvcvc68g1XZywTMMZs1SXCNWcTcZ3qOvIgmgn1I1EpBlysdCUyaf6twpIIl9eY68lRB7do+UQBaXzkMHkb7sXKkw== 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=E0aTpYZBIayAJTU8Q7biEmzV0MnRHl78tQiUE5REJug=; b=n8mdteVoI7zUB85q9jGZzIODrDSmGkrHRmJaPrhYuuo4MbA7FYrfpRvTXAMsBrYYLkdSB+FLu8zqvS7S3cIiZTXPSm6qgv5VHMfX+REBE79/gdPh/7qif+LEXsQxIUOY5APUYDCMuG/eQp6cITidlxkyynhfDuzR40XeThrGJyyKp9i4SXIFTxujc5a6NvrAmLZ8KC44J4tCXAXIhfEsfFjWvJwT/DmerbgrT6t/RrBWiiaiq/K54CbbEncQRaismjpCxv//N6Kak7lApVOVcIbPOZb5NoieVtU15mEo2i2h/KGKeVpufKi+SeU7Evk7jTynNhCNSZDfik/DHsb7tA== 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=E0aTpYZBIayAJTU8Q7biEmzV0MnRHl78tQiUE5REJug=; b=ONP/xp/BC4X31vkPv5dDZA7QAGjcwOKdL7M+6RIUMdbdtrg7WYwtcFulyxyuubgFV7Cqz34sNs1mkE+8zVg+RsvvJ0MQepZttUei0hw4zjrg+xisQWJjySA0OjHv/LL72Zv4c8lFUOSxPL2SUD2WUrj+joFQ3jFV83tlbskQDzQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) by PAXPR04MB8192.eurprd04.prod.outlook.com (2603:10a6:102:1cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Fri, 7 Oct 2022 19:14:09 +0000 Received: from AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90]) by AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90%5]) with mapi id 15.20.5676.038; Fri, 7 Oct 2022 19:14:09 +0000 From: Frank Li To: imx@lists.linux.dev, Jon Mason , Dave Jiang , Allen Hubbe , Kishon Vijay Abraham I , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , Bjorn Helgaas , ntb@lists.linux.dev (open list:NTB DRIVER CORE), linux-pci@vger.kernel.org (open list:PCI ENDPOINT SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v13 2/6] PCI: endpoint: pci-epf-vntb: Fix indentation of the struct epf_ntb_ctrl Date: Fri, 7 Oct 2022 15:13:22 -0400 Message-Id: <20221007191326.193079-4-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007191326.193079-1-Frank.Li@nxp.com> References: <20221007191326.193079-1-Frank.Li@nxp.com> X-ClientProxiedBy: BY3PR03CA0015.namprd03.prod.outlook.com (2603:10b6:a03:39a::20) To AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8793:EE_|PAXPR04MB8192:EE_ X-MS-Office365-Filtering-Correlation-Id: 69cb62ce-50c7-44a5-3a11-08daa8981c84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: asr8XCOi1FzJ2lUJV5QmfzeM5ooUpP7dnuqNzbETs1ID8EEZzzfhEtK3BL3JdoaD421/biPgBUbaNvEphpya7BLBQnqpTuhyE3PMkSqcRidXc3LTlmn5i9TjwvU6ttJupcY8qt5MuLqnRHqJwm9Qz7yFhmpRfTX4VW571OnhK2PJ574VyLQkn4kbebAhjAm6DKqoDc8OHXl1/lLjjuD+oga97xhybDluGALPWpwObOIAc5oWgSUiAe8zub53mE53OjcRt1dp676k8IYd3jYkCHhiBEOXJ3+7djvrouBC/ILRW6x+Dt4u+YvzlYJOk6htCOdODRHAx6e7LYLsXRYiRPqG4SBb2Hwr0Bdc3NYQlfnjyN5b0tUrp1R2/dQT0QhRUR+5IOfIwwNfc6EsJtHAlArrErhaZkFec8nNnRWjLMXoK/0OvYYYaBlgcOEUuHn35WBZok2zZIFrlijgKczquP4ftPcRwbVlV9hvnmNbMAnhKGLi+0yJJTVqI3O39c6XsqnCoK/UI4Jh+vYhP7w3f41nMnA+F0RzQY2KSQpkhzQhvofkWIjo1ETQY1JwJCHvVAjeqlmBxGgECD5vlpGaGtSQOx79EhAxb1JW0PvDwkrCCwzrLyHsqMyD/Vqm3sSPeTu4isH53RDlEYuLbgA9FY6qVn/cGqPjcs0lfchpRAznn4mWA+cniuT93Zjjl2qH3wIDv5D1BkUHgJ5x/YP0I4IKfFyPDbNASWrsBZKsF8hpb84STvjr8upUqahEdG+0lMKJRznmp2sih9I/kAdFhxjg3Uh9G1PJmRuKWibit7I= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8793.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(39860400002)(346002)(376002)(366004)(451199015)(66946007)(36756003)(6666004)(7416002)(38350700002)(8676002)(38100700002)(2906002)(1076003)(41300700001)(66476007)(186003)(66556008)(83380400001)(6512007)(8936002)(2616005)(52116002)(26005)(86362001)(5660300002)(921005)(6506007)(6486002)(110136005)(478600001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZSGPGWp0DTm6o2ZV4rt1vEU9KZ6YTMcGt1THtCRlgrVAlHcghlz62Ek7eMOftwDxIVbXe4mFa1z2NZy5sC05XJ75bLUczFfHp31msGciTAKFncdlYeN0NdKxBxSyUxNxFNJ4WP4Pw9BMBlMR5hhPf9OfoV0lIE6DAQ8Fuo5XQjdKSV7ekcG0uDdR5TeZHMmYT+cmpb4On/YN93SjWOGG6UkHa03p7GfUKy9/cBfjCj1Pz8mu3zxrzLldmsUOkhuk4CBq/eDGOi0uj6cKEP8yNvEUz25LdzasHO+MEEio6W+sA1AM5smh++A/RVOhrU8hS8ajangqjnRymAGWtCqrGdqTw0WcO71etP+QdJ8PHYuci+059XaDllVwjOWMBT/XmWJSJW2KX2Qr1rBy+WDuKxchOha7eRMc/3PT1sExGqQC9TMpw52i/wx77mYuM73nYVd4fbmKAO68UxKEIs86SRAWRPhS2dfxFlQcIahzcWi8kCtWKmLlcRabAP6dSCr/+a+YLNzfjJNWDoO7z6/z+ta8Eg96KNeOKEtI9pg6zKjH3M8183gPmD2sbqttBSveVolAXi2KaooJEzq7WJ8kf/3oyiFRrs51XFPXY/23HKoJAzpGGe1D4su7oYtIMfTc7urpciPmIhHTJnRMKrxEhrXXjz3JRAqtuUseWs1uIXleibiLyEZynutf5OlQdd3b4ZgVA6qE7GqiVdNi4BlZaFNIMfbQUFdawY6mTE7tRnDceUBcIQii6Y1ZZJ6lW43iVcfTcvdEo6RRxJrqFGu7hLJV7yEjdZa62a5XFitrxG6uqfgED6T62Yd+BWIwB2cdkPBUae83P3FNMK2z8E+FDWBanvocnlor5nFCkiBWD8cf8SmOcHV9w4d0WkWvJ2zBffiQdCDTGCKmMksXzus0gH1rVPvPcdOsg1ntJfmwkguWFrA9bqB/wTlOxPcUEaMDCbV107q/MKIxQNyF8NZWi77u5FmC4YBjXLjRrd1pDjpe7cr9Sr1A91oen+qxoo0BtgiVx6tBaIs79ZaixAQt+BbEtmJdv2saB1KrXY7zuW1Fn7vYp/Jk6epV/8u9cLSwnJUqKCNp+6p5Pzb8tzsbvZ8hPoaIwvrt6XLwQltXf8hfWPr9ybeStbV4mBKA79ZAiCLl0G36lfMY5woO87wZZze8E7wiSWuvf9938irpTyTWnxDeA/xc4P/TedIWwnaN4NGjpxYKQFGfrMXJm4Vl1eD2gAThPxN1N+igVnbSKsk/vTx3KDNzvwKW+x3RbBWv87f23tAhJ/Grncr0yoU84mx/KfC0TqXtB9h45D2Qr31oQkTLoyksGmxWb4uG+2RLPGd9ZuigMzcP3eAgV7Q2pfJL0CPmqRXpeGqvbBAWMxL4GbV3PPOTBp99OikccCJhaKyS7MMvcbqSKU1Qq+DcDBPMhp4tSrFRXXyInvG5ROnQU8FMBItCgSP8k2xNydI+9u1P7d1OcQq4b14hkRl9v+fWtYot25BWgm7kvOCHLPAiPNdiJ7Nz/rnh4UIxGr+NV2KnOQnUNad+Z5l7H5U9YgbbpMLmnWzBaCubSpDqTbs= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69cb62ce-50c7-44a5-3a11-08daa8981c84 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8793.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 19:14:09.6237 (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: lhfM4SrBLJvN3lXpbJmCg+r7wp+6F4J7heVMAjzvqiWVfv/22frhxMJPkwEol9hKVVBn6JbfYZqMnIdP1Rt2Bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8192 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Frank Li Indentation of the struct epf_ntb_ctrl align with other struct Signed-off-by: Frank Li --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index c0115bcb3b5e..1863006cc36c 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -99,20 +99,20 @@ enum epf_ntb_bar { * NTB Driver NTB Driver */ struct epf_ntb_ctrl { - u32 command; - u32 argument; - u16 command_status; - u16 link_status; - u32 topology; - u64 addr; - u64 size; - u32 num_mws; - u32 reserved; - u32 spad_offset; - u32 spad_count; - u32 db_entry_size; - u32 db_data[MAX_DB_COUNT]; - u32 db_offset[MAX_DB_COUNT]; + u32 command; + u32 argument; + u16 command_status; + u16 link_status; + u32 topology; + u64 addr; + u64 size; + u32 num_mws; + u32 reserved; + u32 spad_offset; + u32 spad_count; + u32 db_entry_size; + u32 db_data[MAX_DB_COUNT]; + u32 db_offset[MAX_DB_COUNT]; } __packed; struct epf_ntb { From patchwork Fri Oct 7 19:13:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13001422 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A549C4332F for ; Fri, 7 Oct 2022 19:14:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229452AbiJGTOV (ORCPT ); Fri, 7 Oct 2022 15:14:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229710AbiJGTOS (ORCPT ); Fri, 7 Oct 2022 15:14:18 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2058.outbound.protection.outlook.com [40.107.21.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E7ECD77E6; Fri, 7 Oct 2022 12:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iepfl7snjBwzJppU/IWZIhWxhYSAQLH0r05q/SIv/l64mTGu8zuKIOWiUzn6P1Lz5YkpdSV7GjTOjFW+xfmmbZ+aG3LvCu8fOCFrwpzoo62gAYunFZWFpefNqc1LyXPP8RXS27gdRhwgnNXjCf+Rg1yuCnd3pV/h76bJIYThGWQmMoaUT6pGbI98s+XH9kZFgIdF8Dd296HpjFj7Fg4V0wNejR+9zhu8qe5qWa7wxnf6zDkvOUhPoRVsHfg9rOhR4YABqH9vxlDKbian2Srn4CqxeugHm7QjteOVb4f+tn//OJ3M12d9H3ubo/n4eZ2vpFl//wwGhAcHtwBnn95Llw== 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=pyD6aoIjEVUqZqDnSZCuVf6c3XoOXvPwpCEPm4asbEs=; b=isJoCt653zp4U/8n40toxlnGxSRW8huTpx9fkl6lo9FDzCDzqBUGclc/AuzN5sGDa6Q8WJM5xdrf9AorXwaFH4zZRLy4YpqRRPoxy69DCGRcb7UOCzlztyX3KVQku22Y1mGkB9IBJVK1TGCnYDXa3mxL1oIDHFQRqXj2REOsxno2k8IA4r/oRGsiX1NiRiFOMN4hS9fZivTOvPFujhIjKNOgiAMAlGIPcdC8XJLl6eqLjcw5EOyGWZO9E3xFHSTab4WmgML6Hj8+7pZpY6S0Zexk4hUrA1nleCnJMXv3hqB7I78l2n8csUtmvwl6YGY7Hd8Kxmk1vSwL9YgGdgfG0g== 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=pyD6aoIjEVUqZqDnSZCuVf6c3XoOXvPwpCEPm4asbEs=; b=Y4dG8uXObixhTR/okIEq3fvXogTIleLeEWLeuLeNafafTkX5MIRhMBb9cxbOJdmt+lDPJwONde/NRXowVGJhZCXMdcsiJLVtbJr3NOnvxE7eePh3Tt/Oa6wdlvpwZyZ5PgQWelqpS3xrlLwb59diKlGu25XnRGRl/GIhWa/rRqQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) by PAXPR04MB8192.eurprd04.prod.outlook.com (2603:10a6:102:1cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Fri, 7 Oct 2022 19:14:13 +0000 Received: from AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90]) by AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90%5]) with mapi id 15.20.5676.038; Fri, 7 Oct 2022 19:14:13 +0000 From: Frank Li To: imx@lists.linux.dev, Jon Mason , Dave Jiang , Allen Hubbe , Kishon Vijay Abraham I , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , Bjorn Helgaas , ntb@lists.linux.dev (open list:NTB DRIVER CORE), linux-pci@vger.kernel.org (open list:PCI ENDPOINT SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v13 3/6] PCI: endpoint: pci-epf-vntb: fix call pci_epc_mem_free_addr at err path Date: Fri, 7 Oct 2022 15:13:23 -0400 Message-Id: <20221007191326.193079-5-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007191326.193079-1-Frank.Li@nxp.com> References: <20221007191326.193079-1-Frank.Li@nxp.com> X-ClientProxiedBy: BY3PR03CA0015.namprd03.prod.outlook.com (2603:10b6:a03:39a::20) To AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8793:EE_|PAXPR04MB8192:EE_ X-MS-Office365-Filtering-Correlation-Id: 6707ec1e-deba-4f52-8443-08daa8981e89 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LiAqTK/fnQkfq92m2ydXd2FvClop0QN70atTDondaK5cz0hcVNqc9WWF4YwD2gjwfELqnLMQTwBH0LruKXnler00Xn4JQZbWJ9oHpjb/TvNCHM9/iao6k+OviGsm5t9V86Z40NQ3ZEdmenEp3YUu/ZIBSnSDUbfhgjICah1CfsQqdPM4bjur/2HfblCvNkKiotPJ/7QyUaTkAkzB9vJQbXluxtCOJpXS+cfZnaUQ/DRLeAZPUUWLiLkyYy0snHEmz67sF8tGdomUz9CtX2uUpGSG0h4jG9XMAh/Sa6+1M/qWeXBjWDAf5Lgrt4CV2bkzzJLsNB+WBetkXmWOEmxn/lPO9a5/aXen3vi08l5Xkp9GDtwav7ocCQu9qwhv6LnQOcyFfWw5iHMEaYLnbLiwS3KtVuyNlOOhVP/Pqyoy27KvJh9jfkmXWuy/xBZZHxaQdwgsmnrETBWG5bWZO0Qe81tK/d04Fu1p0Qad1blwatEw1QzVawA0oHdsWf0DIHNnOKiSqrkV+soi7UXU0X/iRca96Dz69AHVKDLNwLg3oxjPaA0/D66RTlvVw9SICNCGhQiOtG/lDE25+yMGpYXrMTDBNMXpA5WFgZQqPDbrm3LFQn1K8rCXSDVdJ7crCtsuR6kSeHtkAdOGuVxs+VIzxsEICrn8FdV2sXBju2A2r5S4vMIyoT3uLumFbAdYR7tiWKBfyn0TyqfWgOHs6Mgf3Lr+8eso0SDAgLk36ff+HLszIHYB48SQkkFEk5BR8zQ4v1SAaylYqXfLNR8BvTSaLg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8793.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(39860400002)(346002)(376002)(366004)(451199015)(66946007)(36756003)(6666004)(7416002)(38350700002)(8676002)(38100700002)(2906002)(1076003)(41300700001)(66476007)(186003)(66556008)(83380400001)(6512007)(8936002)(2616005)(52116002)(26005)(4744005)(86362001)(5660300002)(921005)(6506007)(6486002)(110136005)(478600001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3g52ECWT/4s8HTvqsRyqLg3C0uEu76N0ZaAc/QntrxIcDuUvfUSlHo83SwQvKzHiIP2Hu6DJ6HFjLqkNpghNI9Hu+nJqMvtOBHPwqjav5DKkeO7XGv56J15fsC6WpyYlfdXJxyTsCRnO+gb8vlpdVg+yWPVkR8vMyqgo82qweBhOjo8P+MQfrvHNnk0uiNK7/XmTM/bh6JfWwb+LUQpRARG9y9iBTQ7+815M4WkRJqrupJTSETmlAz4zUbJBe8aCIJtxosaJ7Za/TRXD2Pos/5Q7jH6K6EZ+8FZkaaaBRZMVsheqgtNMIvVDpksBWOKwVUBm0/PuQTWVfKknX+jZMYRSDiu8l+luqKmHeWeJrp2wfPY7prmP85sDbp/PWW6qLiQE9h3mMcZkh/U76DgSFCfQL83tVqnTa0nRM2kg2vZpuY3uJR2rONqY5+MgAs9VgXP2JV1aqFKGj0dJBVAqtekI9CPfPtUMAn3o83Ip8s3KsJeetI4x0+iEIhNa+2aoHSRn+Xv6eLycf+IeUpTvCXKrwDYW71BX9uA9F0kwsuqMJLpGwAmzVupkFe1w/RtrLqXPt12f+BSDVk57ee0e28ryTAlo/MxZc/DSUuNLILo+K8VKIe8jf4aamrwOQRE5KeBGgyqzj3ipwOGU/UvIJT0SPGJ2W7qRMXYaVEL+fQCccw7fGzY8ja7Bc3b4UARXsYzL8sH90pB70Pf8aT0mA0Uumfe94avhOTqpFbkvgdZSRQJ0M2BY0uLx7xYILGKL+9PACYxw5Tx+zKyvqr6P8Fu1utiMMeH/yQF5loG6BnNbtEe+xAJZaG2iKgV8kBuhlQDyxhZ/mujqmIPEszBbO93RG22C4DoVtzqTHtOXyS4hBfg5MbKR3mprqXzJ6sebk9/wSB8e5jMJqBynSgN4//7atugpJTwObaPuBwWkVRa6Hq0UglCdF99JHanLe/Xeplkn1a3+XxjtPYMPSMb+ury66oqmI0dxiGH+KAtk7NZ6x364vTqDoLXCcHT+0WbIfBb0XhdvMyeDdMMl9csatrBeEl9ZntE1PX4HtQ9khTZ62y+uVSwCL7AEp+e+41ezII1KUkXuhOmzPUG0Q3ukM+CofNSmneeoD4PfBxeYJqHtdBMbeGro1CgTz/SCpdivqhCuGbNvRnMtsEYqfXfTobfKLpjoJaQvTOYACw002wEHNMCZI22YIPRwkKE/OsZ8oQ0tKqEpp9rCf/X+lELgAVRZBz8LsSEung45sU7XebzymLVq34Y0xvN+I0aC62TuU9xC6Oo1glSc32be/XAwZl3dSAgzNoDJttPYPAMRMVn+69045wLWPFDHtXX9P/xb3anguZUCOITY61dBTVv2CqBPToUKANaxle1LBn7Lph2eh53dNUQpuoLD4xBTIw/itDnlQs3o3lkvI74KC4w1umH1e4Ms4e3SmBspEKOJ5LBEquMZPwrC8gEb1vvuDmL/9RJE3eKyAmMVsx54ieAVdpDpzd5em1vmVuvtH4DkIc+lFnX0D8ZZHNoUH1SUYet1Ta5O/q7NnnFCX6YcJs3pSmt+BsH+QjP5lOyvghYYfKg= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6707ec1e-deba-4f52-8443-08daa8981e89 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8793.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 19:14:12.9838 (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: znwNLwWKSRpxF96DoFnAXnHdZNNWrF/xVJGNmAkHpBne2mO2C3l3chPonEv5I4tsvtlO0bfKrugEMlZaOYTouw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8192 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Frank Li Replace pci_epc_mem_free_addr() with pci_epf_free_space() at error handle path to match pci_epf_alloc_space(). 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; } From patchwork Fri Oct 7 19:13:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13001423 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CCFCC433FE for ; Fri, 7 Oct 2022 19:14:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229472AbiJGTOh (ORCPT ); Fri, 7 Oct 2022 15:14:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229733AbiJGTOU (ORCPT ); Fri, 7 Oct 2022 15:14:20 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2075.outbound.protection.outlook.com [40.107.20.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CAD3ABD6B; Fri, 7 Oct 2022 12:14:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aDb8SvHrPLGoB/mltKQR6Dz1UZEMNIewqahyXb4M4I8E5tIC+RfjDUAAMHSBoW8oiQwpq/ZU5ceg3yxleG9JZF82YACklUY6+RcsmN5eqn6z1u9B43H/CCIAJvlshseVk6OzJRIwF+sKhw7bCfP6bNQWCGZGOXSz9WskeLJkPWfkjhhiI8lEmLZ2T82RhzfKl4kQExRSIr2BF/lGSzu+5t1AUHxppBKRUN4nal86XINlqwlIyxYyOSN6d2/8iEIqZWMsXkF6vWTN9gTD0fexMImQoiTubr49XmM3w95JTme4oSx25sJEwa/pDU7gY7Ybp32H9LdIY7FSY98TAU/24g== 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=QfqKjmRXfkbqfS71fsocR7ajWkM3hp3bLrQF/zSSm4k=; b=nrH0idkBkQgN0ACjkxCTlpdYcsOXWXPDSrV0qH9dzuukrmPnOVFXDAFyCNmiZ0uokE/aR9CswZAgC6tPganw9QlYIuwhO1Eyc57HVzLSNuU+4GKBGkIi8c1pJnmrRsri6tkGUudYuipX1lAQwJdDMixDnpzMqduWSZhVD4LM4EjNx+BPdtTrHH5O/zSxzcUdL50/ZyCk+l05TOgqU8WD0c5zcMVeh9eeRHTdbYClZDDVp+JmPNPgaX7fw9p4NzVUGZwj//o+FpNTC13g11CjXQ6XWMQSZS3eanchudM/xcnFjEnxcSQnTvJHxJYEUxUv2oAOwus5CCgxHiFiuNUSLQ== 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=QfqKjmRXfkbqfS71fsocR7ajWkM3hp3bLrQF/zSSm4k=; b=et40l+XKXs3vABPhC/kSsGvbUm4ancc2LnD/xjRCFsQ/dj2/+mJzFM7qsIyypznMcpGS3YKHNlvHVUPM2IBu1VueKh4M9bbcyT6VctypZ38a4jPzOUXSiSW9LmiZkVIYYsguOYXTro2Jeutt40yDYSCXm408CTi99cMSvHPpeu0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) by PAXPR04MB8192.eurprd04.prod.outlook.com (2603:10a6:102:1cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Fri, 7 Oct 2022 19:14:16 +0000 Received: from AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90]) by AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90%5]) with mapi id 15.20.5676.038; Fri, 7 Oct 2022 19:14:16 +0000 From: Frank Li To: imx@lists.linux.dev, Jon Mason , Dave Jiang , Allen Hubbe , Kishon Vijay Abraham I , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , Bjorn Helgaas , ntb@lists.linux.dev (open list:NTB DRIVER CORE), linux-pci@vger.kernel.org (open list:PCI ENDPOINT SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v13 4/6] PCI: endpoint: pci-epf-vntb: remove unused field epf_db_phy Date: Fri, 7 Oct 2022 15:13:24 -0400 Message-Id: <20221007191326.193079-6-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007191326.193079-1-Frank.Li@nxp.com> References: <20221007191326.193079-1-Frank.Li@nxp.com> X-ClientProxiedBy: BY3PR03CA0015.namprd03.prod.outlook.com (2603:10b6:a03:39a::20) To AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8793:EE_|PAXPR04MB8192:EE_ X-MS-Office365-Filtering-Correlation-Id: c5c739ce-1ad9-473a-49e3-08daa898208a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 30A0quYrcT9Zg38Z70FWWjzA+e0kay2lxToErsL36a3JRsv4E5NC/8y2vY/xBEf97WrJ3zbQ4Xa8VZJeAGff7eXgrs+h/4ElFSasfPHL/NioD0P/G4fMi/JJx8GtyloXkxwtKoY6yWo313uc1v0a2Nbplalp6/yHs5uEO0pQwpCtfxEpZDmXoI4en1Lky0YC3s838GCMcIv9C29UztNpO/BnD4TDcJbyeaImA18qOmWmmRrHu9oEZoQprLCeKVanjJ537ClbL68Gy+DFMlH3boiQxGy462zk8Ao+o8mtVTXCevpwrXMP+0pdTz5qRTOqctT54HinhEYPB6Q6Dzuagaa0HGut0TK5y/fwrwN6NMjFrIZYvtqz9WcorK+nqABTwo804yFz5k53W6EzIATcv8NqoblnezTq0iNwL2bqPG0bmVX0We7M/+FRy5yRPCSiXbvVQcdQSAEWJ2CK9ci6cZENNBOMxW6N42alIwl6ybMNi4ZMoejR9tKYaniSKTGV0ifZq7bY8oRb4SnDUJqFzDSuVGX7KGv8eX2UN+lKlHMArtcfKucMX2jLK8KidKenqLpJQBwACRewklOpska5dP3O8vuyg3iJUMK/KESomLV7KSIcTULNhVUHDYnNjNG5MBjmXhdIKomgIzxJWZckKoqxKxiMRhvQ//Cy/mENoc+eYp5cUbw0LstIDuf2RPNTxy3SSMVidonBFnn7q97pRvgKshix000un3C4KTskNgAnySysHXaBftpIYjJf9X7WTFeq+dvyHUiWGlR0tSAbdZjmwmgkMGWTaDdUrKg4JHU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8793.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(39860400002)(346002)(376002)(366004)(451199015)(66946007)(36756003)(6666004)(7416002)(38350700002)(8676002)(38100700002)(2906002)(1076003)(41300700001)(66476007)(186003)(66556008)(83380400001)(6512007)(8936002)(2616005)(52116002)(26005)(4744005)(86362001)(5660300002)(921005)(6506007)(6486002)(110136005)(478600001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BpWZcwLRwODwZaLncFonVysNLuplp3ci9Du4lx1UaEzjIEIDdtROjQDlKhR5f4t45o5AdcI35ks1q79DWcfSUv9fBKjjK7jc+4M6JhniIFPYtYwt9WX5ML240KUOZu3NH+iADP2h4+gPAPMtYqvmiTSft3gpGt8mLzEyKZjvZam9xlt/NnvcxSzUwFJele6+LJvGfyHGVofg2pQmMu/tAML8YHnYQLF2WLhsgSxx0gNIZEsMsnFY7amf4o193182SFraiyJyDCvoQNZaIUKyR2jDeACliP3XX/Z6ANhz69I3bil7CZi/rFSxu2Rv3x+N37GymNCgPrjNFIH8HtMYd/KuSEPMSxK03aeKyNIeKKNiPECYJMztXNKOhM8eecxnjDw7ky19uDjT77eUW9P6MOPVSdOkCBg2Oa0vEJi9O/UC3+xdes8HdxpvNIitwAJrnEu/nnKx3m3FoLxzFJAsGDgJRb7PHMZbGBKJvjuG5S7dxK8hek3jiML8l1V7mMDzCU6bgONEv4x6kAfCKvYfVhlcy+lzr2DA2iWayQI4axKamIVHburWoiJBH1sBCyVIzegzFIWOpj5LGfFKIem/F2SALd+QQw3G6fOGcOkJPf9yyt3clZ4WRCMv6B7u7uhMDAKkSy9qru306382Qd+tCH1gopQYzeAEFWxXXerQBaKL/FZxoaolqdP1EyAyMziWK6TRkT/ke6mLOLhnWICsixqEPAapuVXirsi7RxEC1AXZktch6mhu0otNytbbwwH8PbYNnzfL3TDT5MZb7RT/sIuGj2vHYFi7z6iLcyRdajJoTU+lcEVett/H6R7fEnM11wyJWCJK+s+0fdRAjH3LEX60cYAsX+LL2reGd+ULWwvV8t0Cx6ZDruxYK/tmapMqnDiArCiA9hCja8FcuTV3KTuzzghymaMq7GLA193plCpEbeLcHTi1VRRk3o2br/oeWD+hP+juhpTC2CGqronbD7oNOuCrLurwJgYtBpdC9k47ebjkTP8SBCN4Pu4NRBcL5t/oLEKFya+ExLG0+J7DNSlzzOHKoOnArokh0R9FANQ6xpfUK8BBteiOirPLKTmMp/X+tdgWONDyDLFzr3IRYxdg1QukNwPWJsiWS0kgI1RpvQY0xbyTcmCz/i6IP1jj3pxoRmwWegD1lYT9gvVZDdQLA8AOxBsn9CrTeLc7NqLk4E/bFJxgbM1+bjVdse+mtXGREvrcpkEUqeuFCcLw3iVIWpCdxXbCslQ39+vfufGDc1XypVcA2pTSDmGWzbHPxdJizuwrAnZIqfDYs5UnoshOVs9HvZe/URus3Qa9iyND+boaWUJrde/fpvdPz9QFMlXdfaMj5Qdl4XoWoHtDTvrGNAwVLxTj+p34Ojx2MghrSTQE6aBhPJImfwVwTGvhFKmfQJ3JULQDritZo3aZhz0agj/32ZoRc5S2tjndiaumjeibnjorIDN0H7m155lOXpAWkGK7vtUlhrDR0EftTiHrqDXz3dEJEvQphEA2/qLH5fKTF51sV7H2y/Hrs7AtmRbH7h9MS/ILQQC6Xm1d6OL24T46FlrOJvB/lEK80sE= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5c739ce-1ad9-473a-49e3-08daa898208a X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8793.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 19:14:16.4055 (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: NnosGQP+iP7+q5FDE3tRCKl6r8VLn8yrAG5KyF0iXPNTX+mvFoW71SLf0g9xXhaCTezWaLdMP0pQ8YrqaOyeRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8192 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Frank Li None use epf_db_phy and remove it. Signed-off-by: Frank Li --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index 191924a83454..ee66101cb5c4 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -136,7 +136,6 @@ struct epf_ntb { struct epf_ntb_ctrl *reg; - phys_addr_t epf_db_phy; void __iomem *epf_db; phys_addr_t vpci_mw_phy[MAX_MW]; From patchwork Fri Oct 7 19:13:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13001419 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74708C433FE for ; Fri, 7 Oct 2022 19:14:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229596AbiJGTOH (ORCPT ); Fri, 7 Oct 2022 15:14:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229452AbiJGTOG (ORCPT ); Fri, 7 Oct 2022 15:14:06 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2068.outbound.protection.outlook.com [40.107.20.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41A75E1E; Fri, 7 Oct 2022 12:14:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AGXwVJOFGqnvy9fq+4fCRYS2eDnDOpd6sm8iqAJCwjn6RtlUV+ORcZKJ/Hjp3C0ipCf4zPszN8poPr9BTiOIDdkgc35zEWsn1X2cR6SEzuzIOqi/oNiHLkZzHA0lxEy4SNdpRsi5gi8PjNua6yDxA1ookEsOyxSUplUt/XkrxOicVNZ90ELmaT7L88o/qJCp+Vj02daQUcn4xW0mMoFD1xrhq0rV9imTeyBPa/32gnJIC9wsekEwhtW8SQB6x+XLvXbIYUYw6kxPSh3u3xv2V5XvoObI0GxfvGMPC8TfZCAbM9uV4f/eQQeIUY1HC3cWckwveEF0xM+i51xtOTNfog== 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=Sv21a6BMPaapi/PwjWIE7c4OBzC9tkTbhunXpI4m54w=; b=ONlIqSt6xIWGPJu50cfJ7Ln652Pl8kIhXeBex7jQ0JFCZGxudMNLlfQdfv5HmdyhZXnl0cLTu6A9EihEqZ/mGs/s1W+ocsBXIKEIxFyNPJqXYnGeBJvPs5amC/NOQS4q3EVmneFiAcWfq9RQABNoGMmt9JFNrEF2uYXnpq3cTredxweRW2Vq5OYTiZ8nwfjwZZ+CRCFZUVcvtsGBUpo+kOwFcFnU5vHiPfgfFH0zCltZ7DpUoume51s1bRB7c/ljnAdu7EKySciR00n+Vy8a0gT0Z3V5s9ZWXSqlxkrfbxWSGJ0mDxMKWfxh+QyOnENG2tGG9GC1tUQdOGeRdn5m+g== 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=Sv21a6BMPaapi/PwjWIE7c4OBzC9tkTbhunXpI4m54w=; b=AcBSK1Bg3KyiaI9hRWKB4uxZf7JYLgP1LzDzRfo7ZAUd7uy4vvDbE6dKHjj9s5QiNgkEhI9eqaY3GG5fsuuRyLwj0HoehVP5qbcno3kjAxLd5GbbSaU8MPSR4FdY7OxMGzwCY1vOdM3MJszODQNa7eBfsk5nY+gT1hVO2b8uRHE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) by PAXPR04MB8192.eurprd04.prod.outlook.com (2603:10a6:102:1cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Fri, 7 Oct 2022 19:14:01 +0000 Received: from AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90]) by AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90%5]) with mapi id 15.20.5676.038; Fri, 7 Oct 2022 19:14:01 +0000 From: Frank Li To: imx@lists.linux.dev, Jon Mason , Dave Jiang , Allen Hubbe , Kishon Vijay Abraham I , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , Bjorn Helgaas , ntb@lists.linux.dev (open list:NTB DRIVER CORE), linux-pci@vger.kernel.org (open list:PCI ENDPOINT SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v12 5/6] PCI: endpoint: pci-epf-vntb: Clean up Date: Fri, 7 Oct 2022 15:13:19 -0400 Message-Id: <20221007191326.193079-1-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: BY3PR03CA0015.namprd03.prod.outlook.com (2603:10b6:a03:39a::20) To AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8793:EE_|PAXPR04MB8192:EE_ X-MS-Office365-Filtering-Correlation-Id: a9079cd3-ba98-44b8-84ca-08daa8981777 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1/YZRTPTEhU2vP7Tdl37MR7N0JHDR2OLGHPtcE14C63qUA2X0l3wq3tfJezKm1InodQINMWNPIHvfGx7tANPTdGhWBbalhURIPpQmQh8bAXcBZOxUtW2Gw94+Cp0Ep6RaLeave3T3SmfHbCFJiR0EEX2UmiYOpNwK/rSpumj2lI5/ngeYvGKVlgn0SAsl+vUKvXopC7Qdm9iMHdIA7QkwubeBgoy2rLVPPcUec2gA3y28ESjY/XBxeU6aku2eAm6h00YCwD95dyoBCp2eR8HuTe21WsWipBWWBRuTxeNJ7ptzYkVU1W8KPVLs6x8JUDwTdGoDqiHlt3dbk8BMIXTL73KsEvUbSMXSceCsDzzBARO8rXpAiv4ECbomUddZy2f/mAMSog65KdR4OEJb0f0Awo7UuB8gd9cFJMVcfVWkH4oYQfFeMFCUkAbVXAdiEAnWa09VDWdAlOFNp7DEEk4H0NRFlerxeyaW3StyAkdz0o4fztXkoIRZEwZJl/A63Zxfb9riSkNmw4i6xWvURTML6BJ6mLsJTaynaEJWtuN4WsyON3bUxBetK/qXvwzVKm95ZN6ZrmijPGg+hWjCOKGsLPjK19DReAazVMxWOuHjp6YFNhT/oqcyWkktN+UCWNJsgHJB2Nax1jECsUcyEpXq3d0HFWHt1JNvGduMKcuo5Z4uH/MVtSKJ9HyaSZtpeCD9NWn4v43zTnOMl4UVGQu6wuStfdQ8/3ri5rF1jwA0D9HtujudKSpUDFmavl1pM7VmkxRLutyolAJZ+B8IubfdhpPm21pUYvFIpIRoMB8c18= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8793.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(39860400002)(346002)(376002)(366004)(451199015)(66946007)(36756003)(6666004)(7416002)(30864003)(38350700002)(8676002)(38100700002)(2906002)(1076003)(41300700001)(66476007)(186003)(66556008)(83380400001)(6512007)(8936002)(2616005)(52116002)(26005)(86362001)(5660300002)(921005)(6506007)(6486002)(110136005)(478600001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P1OhdH+1A+uY06v43RGApMKlj0bZp2/UdlVxzg3uSW3eRjcgPXRb1BaaKLYLD+23upZTsiBqzcVFyfoOUBIWr0ZxUAVX1hq/zfAxZS95Z/+gIusXtb8zFMKeVlpu9bK/7Pt6HzLKwBT11nOG1OLgS4FUku0BJ9hTD/J/nvozCUAf1ZgStpvRb81twAT+/kwDI18K39+qDL7DeCnj4GC7XS9AC8sMWumlr1+dtoQJjpg99ip01a8FOHJykFnVXRq42JvAINI7k/fvDFahrAZQpETUWjitpMJEsBKulAKxG/9rveKhHAr4ZYMXyiZ/W41UN4GdtZGGhA7KUVs5gv2fm0CXDyZnd69czoZqlh4hqJAhuPa18IOR+BiFHmw6LQk2LbQRnBA5EVHj23cK8egWlpkqgEIUQvoTxueqHsULvAKw6qCzWumACwdrTgoCboNeWQg5eguqYypariHBcLQf4S7Sc21K1PIo+3tBIUbmPy82ZzYkf42NLeaZm4AZFGwfFapHGHRM9nS5Cf1+FlMWWxoYte8urK/hrHmcWJkOWe6WEzKd6zvC6pf04nwLPtRu/21Ufo8FVOCqDFSxStVykoTXoczydSUzJiAuckOq1fObh00F+hxYDtT1pzGnlFLyS64N5pBj5c/HVJZvyqfAkihFzuBzz0G/Gg5T88u6oKiqPWiiXCT3EIDdjksvTYnuqb6H5PAUjJbtnCTdU9Q4iAtT21Q0f9AHexFRfvGB/HFyYhMksQ7DfBILHWeKvnb1do7rYggYkM2C83Eh0rjVTrHldMkGKrU/nsH63mNmSZyeyVtR23lw9+Blu4xGExTRQAoEJh4OjUNKN5vNejhg4M8kBqhH+kdaHxo9Vek/ytiHaxlNd5WtPPygzgIZnKCPL25hH0HfO1T4XHTDTTDtUcl8fKXxyM9oWGwDzhCH5Ipwxw4wN6oSWG9LpvSv9m0CwxszkLcUr5IaKq3sOE0CVqDzR8w55XFoZi4RYpnrOlmsntWL2okac5Mawzgyplg9s73CWti2zfl426OeSrf47sYpbJLZX+gkyWnSbE8vLIOp214baXJ4otvvWHG2KZgJzc3IDRbCaZkYf+9vt9a/Uf4nQI87BwywQnhvEcEOsYBiwgCLRBW6W5Lkc3VhmXXcKTuwXdiqAOxH7/Dzat1w5PdLiu1KPlzrNz+HbfRKgXG6YpbsLbIDT9qX1YYTashFLGDeRX2PpIZTDJmWM15PiQHFnlhaavXomOsnsUSMjCo6XJhsWzZhoXI/17Jf0noHeCqKG02f5m1R5LHbHi5W/4NORezlKeGFZHIXA0ZiJ+Lowt/bBOSsYYy2uPmXlgRxYc0YlY+3nc/yXyy6Z4otoEigOzTNjXx8gWHig0zXII/s+Riv7OhzX1fHMhlY6e2kWnLP3Lxp4zBfJJSSLc3STlQ5W2Dr7qLuvCMCm8QQdHSDySarxbb5lA1TTNlFwPk8/jwKDfQjJbyzfgRDPsNF2vnKdouP85zvSiSCvTfjjfy69l9pS3yt9oxbk96HPanGqSz7dBHcR3TDVayj1b0ruhg+IPyDQro16YRhVrBqZbw= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9079cd3-ba98-44b8-84ca-08daa8981777 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8793.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 19:14:01.1665 (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: aHte+MROXysI19E+qXK0Qeqb21TZtrX1WkfJMmiqo+3ACKTYfcYTtoxOibOJSMKd8Or3qS0m5GMO4ZLZqkJ67g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8192 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Remove unused field: epf_db_phy. Remove __iomem before epf_db. Change epf_db to u32* from void * Remove duplicate check if (readl(ntb->epf_db + i * 4)). Using sizeof(u32) instead of number 4 at all place. Clean up sparse build warning: Using epf_db[i] instead of readl() because epf_db is located in local memory and allocated by dma_alloc_coherent(). Sparse build warning when there are not __iomem at readl(). Added __iomem force type convert in vntb_epf_peer_spad_read\write() and vntb_epf_spad_read\write(). This require strong order at read and write. Replace pci_epc_mem_free_addr() with pci_epf_free_space() at error handle path to match pci_epf_alloc_space(). Cleanup warning found by scripts/kernel-doc Fix indentation of the struct epf_ntb_ctrl Consolidate term host, host1 to HOST vhost, vHost, Vhost, VHOST2 to VHOST Signed-off-by: Frank Li --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 157 ++++++++++-------- 1 file changed, 90 insertions(+), 67 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index 1466dd1904175..acea753af29ed 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -11,7 +11,7 @@ * Author: Kishon Vijay Abraham I */ -/** +/* * +------------+ +---------------------------------------+ * | | | | * +------------+ | +--------------+ @@ -99,20 +99,20 @@ enum epf_ntb_bar { * NTB Driver NTB Driver */ struct epf_ntb_ctrl { - u32 command; - u32 argument; - u16 command_status; - u16 link_status; - u32 topology; - u64 addr; - u64 size; - u32 num_mws; - u32 reserved; - u32 spad_offset; - u32 spad_count; - u32 db_entry_size; - u32 db_data[MAX_DB_COUNT]; - u32 db_offset[MAX_DB_COUNT]; + u32 command; + u32 argument; + u16 command_status; + u16 link_status; + u32 topology; + u64 addr; + u64 size; + u32 num_mws; + u32 reserved; + u32 spad_offset; + u32 spad_count; + u32 db_entry_size; + u32 db_data[MAX_DB_COUNT]; + u32 db_offset[MAX_DB_COUNT]; } __packed; struct epf_ntb { @@ -136,8 +136,7 @@ struct epf_ntb { struct epf_ntb_ctrl *reg; - phys_addr_t epf_db_phy; - void __iomem *epf_db; + u32 *epf_db; phys_addr_t vpci_mw_phy[MAX_MW]; void __iomem *vpci_mw_addr[MAX_MW]; @@ -156,12 +155,14 @@ static struct pci_epf_header epf_ntb_header = { }; /** - * epf_ntb_link_up() - Raise link_up interrupt to Virtual Host + * epf_ntb_link_up() - Raise link_up interrupt to Virtual Host (VHOST) * @ntb: NTB device that facilitates communication between HOST and VHOST * @link_up: true or false indicating Link is UP or Down * * Once NTB function in HOST invoke ntb_link_enable(), - * this NTB function driver will trigger a link event to vhost. + * this NTB function driver will trigger a link event to VHOST. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up) { @@ -175,9 +176,9 @@ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up) } /** - * epf_ntb_configure_mw() - Configure the Outbound Address Space for vhost - * to access the memory window of host - * @ntb: NTB device that facilitates communication between host and vhost + * epf_ntb_configure_mw() - Configure the Outbound Address Space for VHOST + * to access the memory window of HOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * @mw: Index of the memory window (either 0, 1, 2 or 3) * * EP Outbound Window @@ -194,7 +195,9 @@ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up) * | | | | * | | | | * +--------+ +-----------+ - * VHost PCI EP + * VHOST PCI EP + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_configure_mw(struct epf_ntb *ntb, u32 mw) { @@ -219,7 +222,7 @@ static int epf_ntb_configure_mw(struct epf_ntb *ntb, u32 mw) /** * epf_ntb_teardown_mw() - Teardown the configured OB ATU - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * @mw: Index of the memory window (either 0, 1, 2 or 3) * * Teardown the configured OB ATU configured in epf_ntb_configure_mw() using @@ -234,12 +237,12 @@ static void epf_ntb_teardown_mw(struct epf_ntb *ntb, u32 mw) } /** - * epf_ntb_cmd_handler() - Handle commands provided by the NTB Host + * epf_ntb_cmd_handler() - Handle commands provided by the NTB HOST * @work: work_struct for the epf_ntb_epc * * Workqueue function that gets invoked for the two epf_ntb_epc * periodically (once every 5ms) to see if it has received any commands - * from NTB host. The host can send commands to configure doorbell or + * from NTB HOST. The HOST can send commands to configure doorbell or * configure memory window or to update link status. */ static void epf_ntb_cmd_handler(struct work_struct *work) @@ -254,12 +257,9 @@ static void epf_ntb_cmd_handler(struct work_struct *work) ntb = container_of(work, struct epf_ntb, cmd_handler.work); for (i = 1; i < ntb->db_count; i++) { - if (readl(ntb->epf_db + i * 4)) { - if (readl(ntb->epf_db + i * 4)) - ntb->db |= 1 << (i - 1); - + if (ntb->epf_db[i]) { ntb_db_event(&ntb->ntb, i); - writel(0, ntb->epf_db + i * 4); + ntb->epf_db[i] = 0; } } @@ -321,8 +321,8 @@ static void epf_ntb_cmd_handler(struct work_struct *work) /** * epf_ntb_config_sspad_bar_clear() - Clear Config + Self scratchpad BAR - * @ntb_epc: EPC associated with one of the HOST which holds peer's outbound - * address. + * @ntb: EPC associated with one of the HOST which holds peer's outbound + * address. * * Clear BAR0 of EP CONTROLLER 1 which contains the HOST1's config and * self scratchpad region (removes inbound ATU configuration). While BAR0 is @@ -331,8 +331,10 @@ static void epf_ntb_cmd_handler(struct work_struct *work) * used for self scratchpad from epf_ntb_bar[BAR_CONFIG]. * * Please note the self scratchpad region and config region is combined to - * a single region and mapped using the same BAR. Also note HOST2's peer - * scratchpad is HOST1's self scratchpad. + * a single region and mapped using the same BAR. Also note VHOST's peer + * scratchpad is HOST's self scratchpad. + * + * Returns: void */ static void epf_ntb_config_sspad_bar_clear(struct epf_ntb *ntb) { @@ -347,13 +349,15 @@ static void epf_ntb_config_sspad_bar_clear(struct epf_ntb *ntb) /** * epf_ntb_config_sspad_bar_set() - Set Config + Self scratchpad BAR - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * - * Map BAR0 of EP CONTROLLER 1 which contains the HOST1's config and + * Map BAR0 of EP CONTROLLER which contains the VHOST's config and * self scratchpad region. * * Please note the self scratchpad region and config region is combined to * a single region and mapped using the same BAR. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_config_sspad_bar_set(struct epf_ntb *ntb) { @@ -380,7 +384,7 @@ static int epf_ntb_config_sspad_bar_set(struct epf_ntb *ntb) /** * epf_ntb_config_spad_bar_free() - Free the physical memory associated with * config + scratchpad region - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_config_spad_bar_free(struct epf_ntb *ntb) { @@ -393,11 +397,13 @@ static void epf_ntb_config_spad_bar_free(struct epf_ntb *ntb) /** * epf_ntb_config_spad_bar_alloc() - Allocate memory for config + scratchpad * region - * @ntb: NTB device that facilitates communication between HOST1 and HOST2 + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Allocate the Local Memory mentioned in the above diagram. The size of * CONFIG REGION is sizeof(struct epf_ntb_ctrl) and size of SCRATCHPAD REGION * is obtained from "spad-count" configfs entry. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) { @@ -424,7 +430,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) spad_count = ntb->spad_count; ctrl_size = sizeof(struct epf_ntb_ctrl); - spad_size = 2 * spad_count * 4; + spad_size = 2 * spad_count * sizeof(u32); if (!align) { ctrl_size = roundup_pow_of_two(ctrl_size); @@ -454,7 +460,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) ctrl->num_mws = ntb->num_mws; ntb->spad_size = spad_size; - ctrl->db_entry_size = 4; + ctrl->db_entry_size = sizeof(u32); for (i = 0; i < ntb->db_count; i++) { ntb->reg->db_data[i] = 1 + i; @@ -465,11 +471,13 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) } /** - * epf_ntb_configure_interrupt() - Configure MSI/MSI-X capaiblity - * @ntb: NTB device that facilitates communication between HOST and vHOST + * epf_ntb_configure_interrupt() - Configure MSI/MSI-X capability + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Configure MSI/MSI-X capability for each interface with number of * interrupts equal to "db_count" configfs entry. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) { @@ -511,18 +519,22 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) /** * epf_ntb_db_bar_init() - Configure Doorbell window BARs - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_db_bar_init(struct epf_ntb *ntb) { const struct pci_epc_features *epc_features; - u32 align; struct device *dev = &ntb->epf->dev; - int ret; struct pci_epf_bar *epf_bar; - void __iomem *mw_addr; enum pci_barno barno; - size_t size = 4 * ntb->db_count; + void *mw_addr; + size_t size; + u32 align; + int ret; + + size = sizeof(u32) * ntb->db_count; epc_features = pci_epc_get_features(ntb->epf->epc, ntb->epf->func_no, @@ -557,14 +569,14 @@ 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; } /** * epf_ntb_db_bar_clear() - Clear doorbell BAR and free memory * allocated in peer's outbound address space - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_db_bar_clear(struct epf_ntb *ntb) { @@ -580,8 +592,9 @@ static void epf_ntb_db_bar_clear(struct epf_ntb *ntb) /** * epf_ntb_mw_bar_init() - Configure Memory window BARs - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb) { @@ -629,7 +642,7 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb) /** * epf_ntb_mw_bar_clear() - Clear Memory window BARs - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST */ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb) { @@ -652,7 +665,7 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb) /** * epf_ntb_epc_destroy() - Cleanup NTB EPC interface - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper for epf_ntb_epc_destroy_interface() to cleanup all the NTB interfaces */ @@ -665,7 +678,9 @@ static void epf_ntb_epc_destroy(struct epf_ntb *ntb) /** * epf_ntb_init_epc_bar() - Identify BARs to be used for each of the NTB * constructs (scratchpad region, doorbell, memorywindow) - * @ntb: NTB device that facilitates communication between HOST and vHOST + * @ntb: NTB device that facilitates communication between HOST and VHOST + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_init_epc_bar(struct epf_ntb *ntb) { @@ -706,11 +721,13 @@ static int epf_ntb_init_epc_bar(struct epf_ntb *ntb) /** * epf_ntb_epc_init() - Initialize NTB interface - * @ntb: NTB device that facilitates communication between HOST and vHOST2 + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper to initialize a particular EPC interface and start the workqueue - * to check for commands from host. This function will write to the + * to check for commands from HOST. This function will write to the * EP controller HW for configuring it. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_epc_init(struct epf_ntb *ntb) { @@ -777,7 +794,7 @@ static int epf_ntb_epc_init(struct epf_ntb *ntb) /** * epf_ntb_epc_cleanup() - Cleanup all NTB interfaces - * @ntb: NTB device that facilitates communication between HOST1 and HOST2 + * @ntb: NTB device that facilitates communication between HOST and VHOST * * Wrapper to cleanup all NTB interfaces. */ @@ -934,6 +951,8 @@ static const struct config_item_type ntb_group_type = { * * Add configfs directory specific to NTB. This directory will hold * NTB specific properties like db_count, spad_count, num_mws etc., + * + * Returns: Pointer to config_group */ static struct config_group *epf_ntb_add_cfs(struct pci_epf *epf, struct config_group *group) @@ -1084,11 +1103,11 @@ static int vntb_epf_link_enable(struct ntb_dev *ntb, static u32 vntb_epf_spad_read(struct ntb_dev *ndev, int idx) { struct epf_ntb *ntb = ntb_ndev(ndev); - int off = ntb->reg->spad_offset, ct = ntb->reg->spad_count * 4; + int off = ntb->reg->spad_offset, ct = ntb->reg->spad_count * sizeof(u32); u32 val; - void __iomem *base = ntb->reg; + void __iomem *base = (void __iomem *)ntb->reg; - val = readl(base + off + ct + idx * 4); + val = readl(base + off + ct + idx * sizeof(u32)); return val; } @@ -1096,10 +1115,10 @@ static int vntb_epf_spad_write(struct ntb_dev *ndev, int idx, u32 val) { struct epf_ntb *ntb = ntb_ndev(ndev); struct epf_ntb_ctrl *ctrl = ntb->reg; - int off = ctrl->spad_offset, ct = ctrl->spad_count * 4; - void __iomem *base = ntb->reg; + int off = ctrl->spad_offset, ct = ctrl->spad_count * sizeof(u32); + void __iomem *base = (void __iomem *)ntb->reg; - writel(val, base + off + ct + idx * 4); + writel(val, base + off + ct + idx * sizeof(u32)); return 0; } @@ -1108,10 +1127,10 @@ static u32 vntb_epf_peer_spad_read(struct ntb_dev *ndev, int pidx, int idx) struct epf_ntb *ntb = ntb_ndev(ndev); struct epf_ntb_ctrl *ctrl = ntb->reg; int off = ctrl->spad_offset; - void __iomem *base = ntb->reg; + void __iomem *base = (void __iomem *)ntb->reg; u32 val; - val = readl(base + off + idx * 4); + val = readl(base + off + idx * sizeof(u32)); return val; } @@ -1120,9 +1139,9 @@ static int vntb_epf_peer_spad_write(struct ntb_dev *ndev, int pidx, int idx, u32 struct epf_ntb *ntb = ntb_ndev(ndev); struct epf_ntb_ctrl *ctrl = ntb->reg; int off = ctrl->spad_offset; - void __iomem *base = ntb->reg; + void __iomem *base = (void __iomem *)ntb->reg; - writel(val, base + off + idx * 4); + writel(val, base + off + idx * sizeof(u32)); return 0; } @@ -1275,6 +1294,8 @@ static struct pci_driver vntb_pci_driver = { * Invoked when a primary interface or secondary interface is bound to EPC * device. This function will succeed only when EPC is bound to both the * interfaces. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_bind(struct pci_epf *epf) { @@ -1359,6 +1380,8 @@ static struct pci_epf_ops epf_ntb_ops = { * * Probe NTB function driver when endpoint function bus detects a NTB * endpoint function. + * + * Returns: Zero for success, or an error code in case of failure */ static int epf_ntb_probe(struct pci_epf *epf) { From patchwork Fri Oct 7 19:13:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13001425 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 259D6C433FE for ; Fri, 7 Oct 2022 19:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229844AbiJGTOy (ORCPT ); Fri, 7 Oct 2022 15:14:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229777AbiJGTOi (ORCPT ); Fri, 7 Oct 2022 15:14:38 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2089.outbound.protection.outlook.com [40.107.20.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CF5DD8EED; Fri, 7 Oct 2022 12:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BDcZ2FP9oTAa4VYPwqgZhiOLelVGvbqhWljfW22n9Q0luLG42sK5DRLElkqPLLL30s9WycPjgLQsgA3fwLgQhp5w5gntkpjMgQAt+UntMWEUfOziU2fNfJHHMfKvmGaC4bKMYGuxnQCYrV3LKxWesLutft6Hnrl1OwDLuBrQRd/svKyAthjxb+kRHtwqDKtXlcWx4uBghKqz1elRmML6AWMEADWsx9oeKUOeHThXviPpCFEGdxjo/r3uL/4Ic2vOidCwfZVfv/5g2V51bJFjA6W+yfrx5T2cUyePVwa0GDNve/nOpnfcvf5tQD6ciBxQnsqWGUtjT3ygyOOQAQjVDw== 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=AF6juBIUfEb+5nX+4ySQMH0fMffTYAz1usWWEhHb174=; b=bI14bGliWB+xCSLxRHTcgj50L9nNQpkEYM10LmM+Ao+Nba4otzNA5ZG6++Vf/KB1/4MgOsGPd3V1LChV/zRtskkcm+AhlQttwd1MC6IslC2wibdpoMYDtwLJW8uVnELmQXgz2HSD0MCMNIrDM6NeDKYVsYi2MDIzSwoFzld7WdYIdeBPiO343tU6/h9o8ghQdmWrUQYEiAQIdz9Wdgp6bDNKrGgt9gQS8Vz8wXnr317HSelBIbakTaiqs0Zn0uPIsTbjgALCTAt6EiRP/u8qBOryDuq4PaHLv+I8HDHQOwHu6Gx1bFidalmt/v90+yk4jfZ3JSvD2ZT1TALKMYYmjw== 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=AF6juBIUfEb+5nX+4ySQMH0fMffTYAz1usWWEhHb174=; b=f79F9LjoVoSRQeWdIUtaUm9Vfp9Ae2UEKKFuXSsaEdiaOH2kz4HWy2ocE4mA/lCVGJhM0a8LJpKSjTXV9X9+piUeeO8LbpkN2JC6c78vQ73v7fu9827QI5XvoVABpX5sy4T2I88NZU+l2szifW1ouVLMF34/38374meK7jX27Fs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) by PAXPR04MB8192.eurprd04.prod.outlook.com (2603:10a6:102:1cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Fri, 7 Oct 2022 19:14:23 +0000 Received: from AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90]) by AM9PR04MB8793.eurprd04.prod.outlook.com ([fe80::54da:4ebc:2916:de90%5]) with mapi id 15.20.5676.038; Fri, 7 Oct 2022 19:14:23 +0000 From: Frank Li To: imx@lists.linux.dev, Jon Mason , Dave Jiang , Allen Hubbe , Kishon Vijay Abraham I , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , Bjorn Helgaas , ntb@lists.linux.dev (open list:NTB DRIVER CORE), linux-pci@vger.kernel.org (open list:PCI ENDPOINT SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v13 6/6] PCI: endpoint: pci-epf-vntb: fix sparse build warning Date: Fri, 7 Oct 2022 15:13:26 -0400 Message-Id: <20221007191326.193079-8-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221007191326.193079-1-Frank.Li@nxp.com> References: <20221007191326.193079-1-Frank.Li@nxp.com> X-ClientProxiedBy: BY3PR03CA0015.namprd03.prod.outlook.com (2603:10b6:a03:39a::20) To AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8793:EE_|PAXPR04MB8192:EE_ X-MS-Office365-Filtering-Correlation-Id: 02efded4-0a41-4f46-5336-08daa898248a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2rs/trbiKnESiT3VnY1yCU0S/1JBLTsoJIENblkv/Ic0QMqU67WFEQxJwFfvdgB9JEBTBlOJk7IzTWQ+tfA+MX6U3V8hDGtfsOA7SwRF3i6dPoekMm3y7u1s5yTLvKzuhHCaAxnM2L/xP44MlgiSRSbrpqoy2CvCUy8A6CCMUzABdSjza7y1cIvikSQkrsksDmaFyzpqe5ZVd1pklldtQXIP+Rtz18jHRfMIrLxshblPcCgUWQGk9Dj3eBi/D+L5FCSJx+XsrXsK7VaJcZ4avjK+Jvw64XSnnPwcgD5qvd3q2AlARivrRCdKlk25d69lvmz2LqX90OiFidG5pKujQf0kz5Zpng9aNH/7AUg5BCOyyHJqZ8xrRkcXQxI5mn6CKoVYlvXXzrkFz1PpbKiNPZaltcZWAFZDBBiR4TAYcZaP9msjG1l7CErMmVq1zIbAq6eweOxws8WXhVExlq7euQ9YQaNMjpsd/Zw79WKvsXpBpLKerVdTKoSqmoVsWRPptYR+ExdswL9cYdGT51V1cAgHRESt5xudUVkQH4aZ9K6mitjJ/J4a5i/+iMrNUY+OnXwp5h/65dvcPFQ82JApNBdW+q8QqdeS00UXQCys8X5hVBSxWd6pwq4whD47dVduixNzwNoo8d5vwfo4/v/PLbC0YccKHIc1mx+EvAHiC8N3aOuyxNRIKmzh+jQ1S8k74Ivgfdyi4pYcTHSuD3X44hEfcQBzTUR4uuBmQ1aC2gby2jW5iKLzFyQKicuNcIP2C3aZBDFT6Zm91rGK0CjXjGJ0/tBcUIQkgYeuB/VxkdI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8793.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(39860400002)(346002)(376002)(366004)(451199015)(66946007)(36756003)(7416002)(38350700002)(8676002)(38100700002)(2906002)(1076003)(41300700001)(66476007)(186003)(66556008)(83380400001)(6512007)(8936002)(2616005)(52116002)(26005)(86362001)(5660300002)(921005)(6506007)(6486002)(110136005)(478600001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wsx9KZkOFICTXV2hXorz6usH0EKYqo2s9/YrRZSbp662bQF8vGRmNiV/6Na7IAu8+0SMV5pqZyERp7haHH+P/6SoUxSk4fTDZ0NrbAWVfkKy/p3pM6YEUyeCoDW/Ebjsq3/TUSD4JNg6ptp7LTw+AGDVRjuRIOjeORKDY53UCP79o3Og+6zV5efyodxDmAmsLNTqeH13nGsWgW9VAuloC9qvHXYHmPhcuHAiJht2ibNj/8ZgTzc8KJ3oPSolvzH+4ptjdcYeLskfAL7eJyRQ12mAk9GYDtIq6qwC+xeKLilWHMvGKCiAFpIydWEvo1375O8tQd2ta7QNyRgfefLRKoHV53JqaqfGBhnzQTrbfO4Hd/rYbOtfwbBNos0FjqNZIXIidS4IEtyUUKjDV9rSfeJrUOd5jB0O9S1aMLPDJzskTdjWyd001MrDCIbT3bdbZE+PXUHpbDv24MaRmkUTmACmpV7yJ2sR+BvdHQxA6GqG/DkXp5JQSMrAqoRPrCyTU0porQjO24WB7KWZFesIWXjTVeoxMaod1TR4MmoEkQgxPsq1yooO6wG3ent8zcOfzUTixSRgVIZ1Oo8fup+REZtc2HpC96DPpm/C1Dn6QRMWUtdzuP56GZPeUq2qWf/undz+cdCfgdisog8UjZsUOJD6Fl48xbVKE9v2XZYNNgppQXtc8kch2egTz8V36Mor+hhyK1FNvOc4PH7BiCU8aSsOXPpueRcYjcxnpbsfUuI26ci0Qv3ZuShkmx9RFBK2cdyNDBtliJfix2p6Wnwz1DJypdA8ZFlxmfMgXcNhB/eGL/8PNoK688hOA+fpeWe9QhzuSQ9XTykDvJzUPOci+pOTzc2wQaUQH75h9IQKx7ci3NMyMyAWLT4epad78LpF0TeBbXSN4Df4mYST7kvI/rC4mchAdCIhVB8tlFlzoxAYFT0COtdoUvVxc/nIErRvinu4QRaNLFG58Z+7mdsLGWOKL/D3LBRDUnYXKBjUXSJ6P1ViCMKrs9j5iyOct+4lgB791oU9IvS5Y/S04IkVXgL9Mdff2FijFf3h4BsDGNv6S4DZge5iVGpzyACnSzOi7sTI9bYEbF5k9lvKUnEKmJGXZUt7N8qt+aIIwMIAYIetbRB+eUNdK44rsDeDBIpztRDwraqOAiOCWU0AHoiPnW2w3QrHlQEzfL2ddePhICuoFBugEVBCFF7rftmmyZRBN2YFwhuOzz96ofF5S1zD9SwiItRsHQaVblRv9mYm84TcxOmKrAuOJ4VIQF46dH5JYGe3mDLF+AQE8QXuM0U2y2atGRYAvlceQSa5Gei4+6JZ8/8aXA03D5nP0xv05238a+7g18iWPp3lSWMY7NydHOJ7LHNcz/A640h6GuaQorYAKR/GXTpYURfiBazCFOYvxbrnjSlQ1UoUEygzYmVi7/JvCUaZ7Y+UchW0TnhhkAhpN8EI3CflzF54G4wXp4+0yFgCTtyoJ5bmypya9iIq/drhDG5vO+KTBQdpVHZKGxiVWef0xZexOKmd6+femZ5UOzn5tx+iBBi6U2KQU/NwcFFx0q4GziFY6Nn3zlp7zvg= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02efded4-0a41-4f46-5336-08daa898248a X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8793.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 19:14:23.0699 (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: Q4Fi0MCzi7JUbawLmImUqGsvuI6p3mpU1hMQpcV6LfwsswZ7IBRqabzzS+mXm1i9/WOdM8aFb0s67qjWyxvGNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8192 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Frank Li Using epf_db[i] instead of readl() because epf_db is located in local memory and allocated by dma_alloc_coherent(). Sparse build warning when there are not __iomem at readl(). Added __iomem force type convert in vntb_epf_peer_spad_read\write() and vntb_epf_spad_read\write(). This require strong order at read and write. Signed-off-by: Frank Li --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index 54616281da9e..9f1ec6788e51 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -136,7 +136,7 @@ struct epf_ntb { struct epf_ntb_ctrl *reg; - void __iomem *epf_db; + u32 *epf_db; phys_addr_t vpci_mw_phy[MAX_MW]; void __iomem *vpci_mw_addr[MAX_MW]; @@ -257,12 +257,9 @@ static void epf_ntb_cmd_handler(struct work_struct *work) ntb = container_of(work, struct epf_ntb, cmd_handler.work); for (i = 1; i < ntb->db_count; i++) { - if (readl(ntb->epf_db + i * sizeof(u32))) { - if (readl(ntb->epf_db + i * sizeof(u32))) - ntb->db |= 1 << (i - 1); - + if (ntb->epf_db[i]) { ntb_db_event(&ntb->ntb, i); - writel(0, ntb->epf_db + i * sizeof(u32)); + ntb->epf_db[i] = 0; } } @@ -529,13 +526,15 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) static int epf_ntb_db_bar_init(struct epf_ntb *ntb) { const struct pci_epc_features *epc_features; - u32 align; struct device *dev = &ntb->epf->dev; - int ret; struct pci_epf_bar *epf_bar; - void __iomem *mw_addr; enum pci_barno barno; - size_t size = sizeof(u32) * ntb->db_count; + void *mw_addr; + size_t size; + u32 align; + int ret; + + size = sizeof(u32) * ntb->db_count; epc_features = pci_epc_get_features(ntb->epf->epc, ntb->epf->func_no, @@ -1123,7 +1122,7 @@ static u32 vntb_epf_spad_read(struct ntb_dev *ndev, int idx) struct epf_ntb *ntb = ntb_ndev(ndev); int off = ntb->reg->spad_offset, ct = ntb->reg->spad_count * sizeof(u32); u32 val; - void __iomem *base = ntb->reg; + void __iomem *base = (void __iomem *)ntb->reg; val = readl(base + off + ct + idx * sizeof(u32)); return val; @@ -1134,7 +1133,7 @@ static int vntb_epf_spad_write(struct ntb_dev *ndev, int idx, u32 val) struct epf_ntb *ntb = ntb_ndev(ndev); struct epf_ntb_ctrl *ctrl = ntb->reg; int off = ctrl->spad_offset, ct = ctrl->spad_count * sizeof(u32); - void __iomem *base = ntb->reg; + void __iomem *base = (void __iomem *)ntb->reg; writel(val, base + off + ct + idx * sizeof(u32)); return 0; @@ -1145,7 +1144,7 @@ static u32 vntb_epf_peer_spad_read(struct ntb_dev *ndev, int pidx, int idx) struct epf_ntb *ntb = ntb_ndev(ndev); struct epf_ntb_ctrl *ctrl = ntb->reg; int off = ctrl->spad_offset; - void __iomem *base = ntb->reg; + void __iomem *base = (void __iomem *)ntb->reg; u32 val; val = readl(base + off + idx * sizeof(u32)); @@ -1157,7 +1156,7 @@ static int vntb_epf_peer_spad_write(struct ntb_dev *ndev, int pidx, int idx, u32 struct epf_ntb *ntb = ntb_ndev(ndev); struct epf_ntb_ctrl *ctrl = ntb->reg; int off = ctrl->spad_offset; - void __iomem *base = ntb->reg; + void __iomem *base = (void __iomem *)ntb->reg; writel(val, base + off + idx * sizeof(u32)); return 0;