From patchwork Thu Nov 24 05:50:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 25313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3210558wrr; Wed, 23 Nov 2022 21:53:59 -0800 (PST) X-Google-Smtp-Source: AA0mqf4gmD4/QSPR/QroGOZKOu405Zfw+rGiZKC1xW0H0mH/kbfvwVfEHAAVUyzU1g/btlFxr3yv X-Received: by 2002:a17:906:edd2:b0:7bb:1424:b112 with SMTP id sb18-20020a170906edd200b007bb1424b112mr1689645ejb.168.1669269239783; Wed, 23 Nov 2022 21:53:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669269239; cv=pass; d=google.com; s=arc-20160816; b=SqquI49fs4JMdmFRfRD1Kb6LLGqp5jWJhh7DGf45/kzqr1UX1uibh3XvKJtlbAx/Sv nO5hBeE44cFZ3HyBLmrjIBPHbZW6j/3i1dMr2MYrwN37VKgXRL10X7c4kJOH0KNu+RjO 5EQSx9ogTYpjmtzavYcfM9MTjNtIJY5jOA00p9VXIehzDdEzD5zxwbzACX/qaUypyfX8 wstj5WR1QOtFRlgd5TkErSYUbDjj27hf9HQG8wiiNz/yhmcQ47c/sln7bwuYziV+pWUx USwPnIXykcCNsZ64Vl/eASnaS6f5/c4WhvJuFrU+TFvDKgvxihvtF0T55ZEGM0uE2Zk4 JrXw== 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=rqk0haMkUELkhka90hz7fNXOseyw1Mx6qLdspYNQTZg=; b=MEZ9SIkYBZ1aEBFWoNG1dHvgzA9VkiszBuQJDEPk9qh5U0M+kAxgnHi3p7pSz2FSzV t+OPGAUD/CbPzWbPitccbXf1kPycoYmg6hNN2gE8zKsF9crcYZ/K/3Fpe+fTSDlYJRiB gX7/QMU7KjJNP4xHVfTlnJZnj82b9Hj6myhyMSSC79P32WRLN0opF5zMiA4XY+Udle04 8hEdI0CurAditCWKrXMqe9ZJmDEmK7qjBSWF3puxDwcKv5VtAnda71IqDlR1hL6W+DjM mjI2VBcrkLEKUOzn7v9Y1rdvyJxZGPMY/m5nJ6AZPnx4WRPWo1UOhrLh95phxW5te3Cl duug== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=s8F4cLN5; 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 xf9-20020a17090731c900b0079b9f472d85si119222ejb.698.2022.11.23.21.53.36; Wed, 23 Nov 2022 21:53:59 -0800 (PST) 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=s8F4cLN5; 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 S229570AbiKXFvT (ORCPT + 99 others); Thu, 24 Nov 2022 00:51:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbiKXFvM (ORCPT ); Thu, 24 Nov 2022 00:51:12 -0500 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2087.outbound.protection.outlook.com [40.107.103.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29077C6896; Wed, 23 Nov 2022 21:51:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YssmKPDNrdIZAX4uTTrX5V09sDh1YFDCHKw8aQ680pHq4lJQoJfNQoQHf6x3KLx03OUThxsL30eGpvhKzADxRX2m8k8VoklaZMzCc7li5DLzcwXYz1wtpYn/4BbA4ZgoGr8hqg1ezyZrGL4a999Fz+0Ztmmc57Zp/CrLiIYRq7fh4mDeILCJcEg6UXMzjVvnEyd8frm8VnNPRUS4c01f/+IrpfGypY9s4kT0tmZF5dxUQjG4ura6gOG4evqjtlFiB8SwZY6bDT7p3INm6narAtZTy2vWxbWrJ2bltg3T9E1rtpRWG6Powf34t2HSm6224rH7/sdF/k/Z9DQaM3LftA== 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=rqk0haMkUELkhka90hz7fNXOseyw1Mx6qLdspYNQTZg=; b=Y7Y0L/OYjDOq0w/0ZgEHMCbSfWrOj3y3yIo+e3vAoKTslvlAxjUn8bYEhJVLgQjp8w4u+ULmD9Uu6j4XPYpzNazLWf1K7qvLLfXsOqfPGN5FDAUy7/i5Nnv03HjCpY8vXpA8Mcahbxaw5fQILfgxtF71Zf67aeeCmtXtmlu8xIgqdfNCPGvCu9arQk87ZqAZMluRpu6xW9fFhzaeLeqcXnR74HJ8xZxSm8WksRu8RnXI3D5R3Jh5r8uZFtoUeEgSRKsprWlLed4hgFliyYBM09UIGMqOeUH3Y5zfJJPJBJKbyj+yhkYQEZr+yhXZczAwGwsHg1NxFqhqEPlnHNDVUg== 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=rqk0haMkUELkhka90hz7fNXOseyw1Mx6qLdspYNQTZg=; b=s8F4cLN5mXHPyJyqcWzA4invpGg2FYOmWrDzlvlmMGMPW5JH8kbo5wsa9DYVk7FlMz0dhDnovFGQC8wm36cl2pXAakaCKshLCZk9WG4n45hkF17lCEVa4ffHZyMVRSW9b++IcBWf6xw/7Pnf+jneIsyJ1XGbOQ0rANUr+J3I1Qk= 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 DU2PR04MB8600.eurprd04.prod.outlook.com (2603:10a6:10:2db::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Thu, 24 Nov 2022 05:51:09 +0000 Received: from HE1PR0401MB2331.eurprd04.prod.outlook.com ([fe80::a405:3557:91bc:9230]) by HE1PR0401MB2331.eurprd04.prod.outlook.com ([fe80::a405:3557:91bc:9230%12]) with mapi id 15.20.5834.015; Thu, 24 Nov 2022 05:51:09 +0000 From: Frank Li To: lpieralisi@kernel.org Cc: Frank.Li@nxp.com, aisheng.dong@nxp.com, bhelgaas@google.com, devicetree@vger.kernel.org, festevam@gmail.com, imx@lists.linux.dev, jdmason@kudzu.us, kernel@pengutronix.de, kishon@ti.com, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lorenzo.pieralisi@arm.com, lznuaa@gmail.com, manivannan.sadhasivam@linaro.org, maz@kernel.org, ntb@lists.linux.dev, peng.fan@nxp.com, robh+dt@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org, tglx@linutronix.de Subject: [PATCH v13 1/2] PCI: endpoint: pci-epf-vntb: change doorbell register offset calc mathod Date: Thu, 24 Nov 2022 00:50:35 -0500 Message-Id: <20221124055036.1630573-2-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221124055036.1630573-1-Frank.Li@nxp.com> References: <20221124055036.1630573-1-Frank.Li@nxp.com> X-ClientProxiedBy: BYAPR05CA0043.namprd05.prod.outlook.com (2603:10b6:a03:74::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_|DU2PR04MB8600:EE_ X-MS-Office365-Filtering-Correlation-Id: a6870bdd-d50f-4c25-66f1-08dacddfe2a6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Eis+NDbEcKvz2Y/QIhXqPi2reNgsEufe75/jGIQk/8djQJdOB8DgqQX/vpKwNG+uf8eWO22axbiwm23sgZSV2cb6JP75PdoPAzPvC33ekyE+UKPHVWVb6LuJIY3QyOwEBpugrxiP3vactcsSnZ3BAn750tkQ+lZKN/nuon0rE9w5rFZOWaYmK3VsKsGxuXSNSpU/N/acFpCfWiZvRl8wmFcUGnJ/fm8Pcs0bJqFZTuRFagzgPe0z6BvqtcRwbqfCDgIwtNe8hoRVHWFE16Ms7+2HU7kOx4mQ9hvG9/LAoIiq+shz50/pWL2bo91+Y+0FY+moUQlg8lIRg5GRV2y2ffiywJ/cUN+u3/UMqIKjYUN28EWqbSpF6ZPqFvWHvlWuYXbbQv2FHee6ZyouWhv+EaaLQeVfZIdaKIo+1yPQyyyeKdav2CU6063VZaKSCDmgz3xnUgya5ABv7Tk3ctvMsaasIrfJHu3CQ2dtC2jkKXWZEs15eNFmqG9ZVenBlRuZkmKMwTbladZDHxIBlcdyRyAkT/3HY01TgbTCbYY3ddnFvCI65MocGNMJ0H9qPzEgl1DNRNWhLzx3Rov94Win42SZgjBOYPpgmg5WmDKZB8uvFi3TaMVMEJugVfSJjqo/l6NVQDFJSLOi7rnb5WKGMlnLKoy7ENh4RCUv38uYcvRR8l6HbjRMRuR2VOfKZEn7dz6vyzfJdGDt3ZQnUp4/4w== 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)(346002)(136003)(376002)(39860400002)(366004)(396003)(451199015)(7416002)(86362001)(38350700002)(4326008)(2906002)(83380400001)(38100700002)(316002)(8936002)(8676002)(66476007)(1076003)(6916009)(2616005)(6486002)(36756003)(478600001)(186003)(6506007)(66946007)(6512007)(5660300002)(66556008)(26005)(6666004)(41300700001)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ysYt8I2t18Se0iXW1UuuoHNHrc/y96l68rqLY+xtIjrYbgKVNlCES/xgPmgPQdaqVzqlf/S3yDSnUCzs5u2Gu2kgDtOERo+tYoJwcUlSiRmCjXitXlZn4nwfZ0qkNuWI9Uo6yHaKTAhawpWzmhF5VzFfS+aHAX6kFwZOvpLCTUcqo662uzPF4YnGJifszOb8wo4mQDxqv7TRyhg1A6LUwCeLZU6KLQkwBq+1p7Lc1GPuVGw35p/AqTyVvFIVK8nVRc91zArq3PLWCARsV6WzrdAm+x9cDKAFz+3YVsBagkAaLo0K+hjnREJXb5RXfS0H0bzAQRzOQCrtZXK1GCw3A/Bipvovh4Xp4Q4b2LfacVKALXRb0X6ifXMYRERxlQk1oIYD2U1IWe2W9ZYlzZeaC5F4BYGQ48X4Z49UUlK6P/U20G+LF/goI+bNBpqV33GtYO4kuzRc0h1PZltrrhy1WL5gNux7dDnK17baCGoa26tzGeRfd+VhyBP/mARJ1r4XcufiCqCLjbJdW6u7xgLbnK/4+EyW4es/z1ilDWWYXFziBwu+NquplRXb6CHgC57y7TtyLZivfUL1TuloohQnZzYF8lsM/MBxe8alWPJDMkHBaPGJ7p7QF9ldQWRQ/jvs7m6MLAADcoHfWoZKfMXCG8nTJ8vmdo/P3C/KQ4P16orrz0kgIX0xmPK7jwbSra+H1oukocVHm+hUydeBR+3gFCv7RF9qGhE3GeIayItfgyM9uz1xoU0DiS7Uw/XluiZfaE7SLZMtcz8muGUypArTN2yoDuDWkP7hwhwyM0RwktMl0MAIDQAZ6gZY9/hP9ZPfECyUj9OI2m6voBLU8vDGD86sri5gRJqRMqftS7MUvAoKjMWyPy9EkAPv42mV7ZozLQ+t10DMXKeElUwMrx2MjoMicjEelW1lqveJQHHuZQ62iDq8YEsXqtFEYThK4VNP3hDn1Yqi3dyqpk2Wm6oBv0RSb+LduGueYbDARql+J8ka2QhjHX128ya7wwfZyJPjckzgczDzks+U6+idXsSfBeqC0CCRTrjWjs+BKWZeKPffR64F9ihqyCNwnkMcLU9E5P/Wz0XDKshRpvnQOWmlc119RaIFtXvrSN0TKFBfpM6weH4aph6hXuMhpXKWswUWbvdTnos/QfOFM/shwpxnheQyF8XkKCnZyEYFK5sWYFQAG8nHbTQTSEHzpvdDs4peiYEMW+k0LzbpeiBLl/16uX7vKkCUL82wz50tLMXpsRkSeZUEQ89dTYDxdwNQiPWIKgAttNo4e+Gdp6ANzlongoLwVkor2jP6voC6Ms3iZ/w3mNkYnQyD1LgYnjejzUl9Za+M1obcK7iQLda8VcWCkV1TmDj0LN+WGHNFvTobDO70N9VcOWK4VbdXsEoIOUqLXOka4pdjPJ7u3FBotI0vUYboG78vPTsGfRuno7p+QnEPR7Obqravhcprf48oxvEN3Xz+Z/xPEp122CC2/cxVS9ZjAWaTFPrF2T3K3mjZ6uNnv3OIILZeEd6nQll9tK8b7lQiYh3t8lAWphIB8Ra+bQBUvWBReDMiJiKly27qfVGNcFxVM+pkukvAocNWzSbw X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6870bdd-d50f-4c25-66f1-08dacddfe2a6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0401MB2331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2022 05:51:09.5928 (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: 3rBREURmx04wx4Dn+qQS1uVD/ib6dFI9zj4Vi1lJk/ZVRzN+pJtp2W7izOzSOP+Ee9Zc3PCitSK4G6zSx9g9Jg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8600 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?1750355662397093286?= X-GMAIL-MSGID: =?utf-8?q?1750355662397093286?= In drivers/ntb/hw/epf/ntb_hw_epf.c ntb_epf_peer_db_set() { ... db_offset = readl(ndev->ctrl_reg + NTB_EPF_DB_OFFSET(interrupt_num)); writel(db_data, ndev->db_reg + (db_entry_size * interrupt_num) + db_offset); ... } The door register offset's formular is offset = db_entry_size * interrupt_num + db_offset[interrupt_number] Previous db_entry_size is 4, all db_offset is 0. irq | offset -------------- 0 0 1 4 2 8 ... Change to db_entry_size is 0 and db_offset is 0, 4, 8, ... So we can get the same map value between irq and offset. This will be convenience for hardware doorbell register memory map. Signed-off-by: Frank Li --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index 04698e7995a5..0d744975f815 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -461,11 +461,11 @@ 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 = sizeof(u32); + ctrl->db_entry_size = 0; for (i = 0; i < ntb->db_count; i++) { ntb->reg->db_data[i] = 1 + i; - ntb->reg->db_offset[i] = 0; + ntb->reg->db_offset[i] = sizeof(u32) * i; } return 0; From patchwork Thu Nov 24 05:50:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 25315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3210710wrr; Wed, 23 Nov 2022 21:54:35 -0800 (PST) X-Google-Smtp-Source: AA0mqf5tH6/tb2Tk2VLNAWOKFrcBI80sMe5KSGdthyeynho+ByCTIocXl3d2/mxK6mSm1N/c4Sey X-Received: by 2002:a17:906:34d5:b0:7ae:b9fc:8668 with SMTP id h21-20020a17090634d500b007aeb9fc8668mr24670575ejb.257.1669269275472; Wed, 23 Nov 2022 21:54:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669269275; cv=pass; d=google.com; s=arc-20160816; b=stmgyubhJmo+wjU+/P9d5pXEYrqilAF0WapbSvHpjWia7ygyRkWUPtUCrgdOG4AA2f v8qmseqgKda0G17C/vlz8wt9MFfh9iGfvg6M+Ulv9+4bJ3W8DwYVrysrSmnA0lqumyaz +N57W8qgvAhtX98Qt/l9awnfgeAE7gJIAvn4AYHA3JsYWUZ3lvG02IvMdXpEfJvlYugW /MK+6ZQ4oG6F/tjzvDGsqcuAPe+9SympqxKuwqK/UAn5o7hNlpw7b7zZxAjxlmX5nGu9 x+BeIEV2QC6cLDDClfwO36wecJSKQiOVPhs5sK8UYbCgWspoEigvQZBdPEyj0Lh79pNp kP5Q== 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=rDMBfQeDmKtajEdG5pqZ+Y+nU8gRsCayZGEtRR9MAJM=; b=McApETZ7jEOeRHGJfNEUSIm1zh0trk16zejX5lWivD7UB++2jKjOTL4asWC6gJIXhV R6USvmYIU1Na9+ggPjwOCAJ8GPE53Zymj8AI7+KLSktZqE4F41rJytSrAnp1IBUflJ4P DQh3JuNeaPg705DvCa7ajOTnR2L7289QEKy4/TEyNW72of63dDtfTIOe1PC1F2NpM+5a CFUHpE+z2x68zmmxvjTg5euT/Ud5WpAn2b1PPrgrsMX+EaH5j/r1wCQ0r/OqeE8wU7A4 Nvk9ynS1l3N9cEgmNsbHRp3eJRy/9aHSPkLVY9XGdLBvshkiGOfVEQcz1i/dKC/ekl7p sWRQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=ffBrC9C+; 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 ji3-20020a170907980300b007adcee4e54asi152124ejc.408.2022.11.23.21.54.12; Wed, 23 Nov 2022 21:54:35 -0800 (PST) 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=ffBrC9C+; 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 S229608AbiKXFva (ORCPT + 99 others); Thu, 24 Nov 2022 00:51:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229580AbiKXFvU (ORCPT ); Thu, 24 Nov 2022 00:51:20 -0500 Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2074.outbound.protection.outlook.com [40.107.103.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84E3CC7232; Wed, 23 Nov 2022 21:51:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mf0ai62fMQU1zjiw4Co+PSgUD2kcbYSs1GTioAg5UyIKDyAkOG/SPl2G3baoKqVUP5EySj3syd71raL6PnrqvZRnkiBEpxRkqHp0OP3Mjgb/30ToLc1K0r5e0QSPOQ1ODzQn9uF76VpzdrfPNR1zH26Vr1Qv5+h3QAwj+1vuarN9kzBFYpwkLxtAYhy3qqT9itG8hRnd2r0clR3wdTIEUt7i7K80FmCtO2CDbYcNU/2JJkiMNyHiXysgg7iDoVGBV1nQOWSq1QSEXfsy9B1WQ/s+NQPp6TEjDaWkVLtP68cad/pVRURerItlZFSZjxEWzNDfiQZMq1N58dHkaxohWg== 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=rDMBfQeDmKtajEdG5pqZ+Y+nU8gRsCayZGEtRR9MAJM=; b=AhEINoks2Ozkn+G0AePT3EePZybuVtN7tXcmKRhPK4n7tu1gm9QHV+mt1mOCZRqXgqP5WYZYPj6t83Tq7X3l7okMVM9KghEz1VqN9mFZKEC/cKOQzRmkD0/hqR0L2NwtE5Ji0ZnJVCU+OCUtT1NktRzTPMrNBOvHhme0CLGUmdHm82ml/RZmqifiT6XAn3jrOzS3Eb1Ep6wHf9M9DRqXOsxGHoqxGOKeB3AFC8AhM9Qk19W7d1q8L05ZkuFIirQCj91zTzTrUtPutDUYaexi8O1Ms6W2ssGUVoh5BDzB2HaH+m/wwwB895Tfeadhjpn3sf3clS/cb1zrJzpiBCF59w== 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=rDMBfQeDmKtajEdG5pqZ+Y+nU8gRsCayZGEtRR9MAJM=; b=ffBrC9C+SRL6jfQZ0RdG4fBeLDPzNOXAfbeAB1VAGc7hYfVq1zs0nYayh9nLkMcxsMYDnRFvEMzNbpuPcxj3E7bIejYL/mBwOrdOsxwJImrtk9c0yhJHyZ2ir6wanv04hheenrNCAjXLUoP3rpY7+dzCOlTQ448Zm10MgXqe3BY= 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 DU2PR04MB8600.eurprd04.prod.outlook.com (2603:10a6:10:2db::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Thu, 24 Nov 2022 05:51:16 +0000 Received: from HE1PR0401MB2331.eurprd04.prod.outlook.com ([fe80::a405:3557:91bc:9230]) by HE1PR0401MB2331.eurprd04.prod.outlook.com ([fe80::a405:3557:91bc:9230%12]) with mapi id 15.20.5834.015; Thu, 24 Nov 2022 05:51:16 +0000 From: Frank Li To: lpieralisi@kernel.org Cc: Frank.Li@nxp.com, aisheng.dong@nxp.com, bhelgaas@google.com, devicetree@vger.kernel.org, festevam@gmail.com, imx@lists.linux.dev, jdmason@kudzu.us, kernel@pengutronix.de, kishon@ti.com, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lorenzo.pieralisi@arm.com, lznuaa@gmail.com, manivannan.sadhasivam@linaro.org, maz@kernel.org, ntb@lists.linux.dev, peng.fan@nxp.com, robh+dt@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org, tglx@linutronix.de Subject: [PATCH v13 2/2] PCI: endpoint: pci-epf-vntb: using platform MSI as doorbell Date: Thu, 24 Nov 2022 00:50:36 -0500 Message-Id: <20221124055036.1630573-3-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221124055036.1630573-1-Frank.Li@nxp.com> References: <20221124055036.1630573-1-Frank.Li@nxp.com> X-ClientProxiedBy: BYAPR05CA0043.namprd05.prod.outlook.com (2603:10b6:a03:74::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_|DU2PR04MB8600:EE_ X-MS-Office365-Filtering-Correlation-Id: a351d714-aa96-4497-96bb-08dacddfe723 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CiFnwpvaFTUosLntY7CCgSRX6JBjnVly+cE4eS1SadLmSbjSTXJ0AUAtdhv919dBn7iAGhhLfA/1Cj3GyYUmylilc8tLRG9FEqCQLIlG9rD3DCfckxz968iMFPLEfhQRReZrl9rBMhgNzTcbbcEJLglI+VdbGYVa+sHEVL9LqZyaHUNPbAABk2v52rN5trLQsnIrZ6VrAmf2Z2Yyn3Ubwl4oDZnS/HgiXt83/qZIhOv7YravVTqENXE4wrpXftN71boZXT5hSHqaKP9vqHtNDqALWc5/rPChs5QBnE65Szx0zX/iyw0W4BnqY6M3QPI82rn0sItdn85Acf8zEKVkrOh8uLnSXoS/EwwXofjT2X6SyIoJ/etFUfPW0xbIaID7NOebXBL/yM3ccNJD8KrqUNRPXvmoywlh87XNLeZEjNYzsH6+3cJmiFdUCn2RAeP+2ex7n/EXqo2Ixfro44O6/rCmDPU0lG2wS9hJpt19ouN7zkfS7qNkVIIS4zlB0yL3cH72qvB/PJNmXRL8jxKMI+PSPN9QgTW81jg2QLHqKxm6fh64GGFnlETXDSLGTXPJJ16KoTtrPAqte7gkW27pwdFTKtiQOBCeeJZpfCVcI2rMXlBlTpnMT76NDrhHFVBPS+PXJBmd/Mtxd2CpAMk5kdVwHk/OXKbSOXYa3+jLiyw60AydnXCyfzV+yX9eW9McObKsplYZn+sjxjvNS/tUdg== 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)(346002)(136003)(376002)(39860400002)(366004)(396003)(451199015)(7416002)(86362001)(38350700002)(4326008)(2906002)(83380400001)(38100700002)(316002)(8936002)(8676002)(66476007)(1076003)(6916009)(2616005)(6486002)(36756003)(478600001)(186003)(6506007)(66946007)(6512007)(5660300002)(66556008)(26005)(6666004)(41300700001)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Apgihoyuw+gtbHxQCmUF8xaWtXI9?= =?utf-8?q?coUOaLwxzKGfNR6fHgN1pgOBJc40m+yra/KYFKNIayidVpCL11CIwWdylBmU7I47V?= =?utf-8?q?NPCUJCu1zU6hybUl8yd8uNh0WFK4lEgbgtD8o5Zg9lSMK+mM6s5DERaDQSTDxM5YT?= =?utf-8?q?7mOeMDBrOVs6/h6ZLM3lAniSQg+tFeQ8q/SySv/HP1aH8fOz0v5wqFFbYYS8v5PCV?= =?utf-8?q?uAKOD/3i6IzJxRs4/UvffVwAiB2HzfowW0umRxh06TwrjB3Mq4YSnkC0OqNF72s5L?= =?utf-8?q?H8vUMFq1GktijBQz8KqzHp72BIFEdqwwREBYqq0KmBP1XEQOallMgnQP5NGOcFihc?= =?utf-8?q?HXmRVzA5w9W3dGQS9Cv1VVNHD4IZwCetsBSJ2vSZvrQn4JzlM/1q4N9DJWu9Pt9pS?= =?utf-8?q?V/CaQE9zg9Z9/OCkbavd1llGWlyRBBcqyNBFTYLp9vOp5huI8WhtbEg7LsuL8Rrx+?= =?utf-8?q?lN0ThQxqMM0LiEfUh31kk3vsdTsmzZn/vSjVJn1oIpD/FYblNfTLxHVAyQiueogtB?= =?utf-8?q?zEgxFOZHn5/odN+TgFsWHybyCkhmdnH2RAjD4zlTNacoR6/UkQgBl23OGqzjQRN9r?= =?utf-8?q?On+PI2GQPnuxhwYyKB9F5QzDH3tdHMA5Sj8+QQCm+4JmZDDPlJYGog4zQfDjA4H04?= =?utf-8?q?LQRKj/JmPzTy5vpjFCc4wOGg/N+veQ1lUG12P30Ci5jeswb8mCok8ntEY0XjTLiTG?= =?utf-8?q?DhTpFv5hvuDFuOm/N8l0U9+GM6GyWZNNa+NcaMtS2+nM0Q6DR/PKvJIlR0ue4quYT?= =?utf-8?q?iZ1wZxCxwS7yZDa/xvjBmtgqnTNsTNtrEqrnZP+nckyBDE/ZZ44mpOkIbIypddzGs?= =?utf-8?q?cTXDSDHelThJu2lbKTIf9Sj7ueeuphjZTHbiuO9Znury87xrgoEB0N5rz3iRGpNn3?= =?utf-8?q?nBFAdLkrFWrHjxzqajWn7oYZOgwkMLVLE/yYirlGOOlO9VyNg1spRGdHmrQYAhiuR?= =?utf-8?q?VQibRRK5xU89CaGh48xeb/XY1COG1hr2MJ1l7sn8Z72sdGQuRKzQbvlqWMPgLyNe6?= =?utf-8?q?4cRcPG4F0fFl4yeTf1rX98OZwl2kmhv5P8yGpSf/+bjoJNw7Pmg9lXERhjINnCo7p?= =?utf-8?q?qHYH3QOa71L/9hPQKzi7p2TRN8n7DqwjKSSg/F+OZuEuzrdVX4DzSccmtN7RzckF/?= =?utf-8?q?nz2IAEgPpSl42FSqxSpoTYJ5CNZz069Z+j/4GEVZIXuSztoQkj1c65CgF0QzPHNPx?= =?utf-8?q?hM+prTa8zh1bu8dbloKLy8WwMTbQjENgS7TSp4S3q6kkwXuqk0jnMbxiHMNlAnTQ6?= =?utf-8?q?8sKxoR6NW80VztO8z+mvYlSQJcscrIabN2sy0dkZvXIf1LT4R2WGVWQlIMeCrBJgK?= =?utf-8?q?yijvRIYZ90AMkP3N9G1CH0Ll9dTmAgmqWuv04vcf/KAxo+nazQL8maYDP0z0Lt09w?= =?utf-8?q?lC56n0TmRGo+nfqeCNjo1sw5hUOMF2Vgz47gbyvrtCovHYqsU4FjYCTMYvZTK/ybK?= =?utf-8?q?lGBszrr+neifyQ24GGZaE35pw7FdHa5VAjHdRToF8BYZq/CdSFxuD6gQeMu4pZleB?= =?utf-8?q?4y8ET3a4a3iX?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a351d714-aa96-4497-96bb-08dacddfe723 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0401MB2331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2022 05:51:16.7491 (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: 51LwNqmToItrL32oWXZOoX2Al9KJzPvMu3YB/adWukbOYT70t2j+ecjPWXK1+bCbliqGE+vvk3q3VdqPyU+uog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8600 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?1750355661652132383?= X-GMAIL-MSGID: =?utf-8?q?1750355699839588902?= ┌────────────┐ ┌───────────────────────────────────┐ ┌────────────────┐ │ │ │ │ │ │ │ │ │ PCI Endpoint │ │ PCI Host │ │ │ │ │ │ │ │ │◄──┤ 1.platform_msi_domain_alloc_irqs()│ │ │ │ │ │ │ │ │ │ MSI ├──►│ 2.write_msi_msg() ├──►├─BAR │ │ Controller │ │ update doorbell register address│ │ │ │ │ │ for BAR │ │ │ │ │ │ │ │ 3. Write BAR│ │ │◄──┼───────────────────────────────────┼───┤ │ │ │ │ │ │ │ │ ├──►│ 4.Irq Handle │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ └────────────┘ └───────────────────────────────────┘ └────────────────┘ Using platform MSI interrupt controller as endpoint(EP)'s doorbell. The memory assigned for BAR region by the PCI host is mapped to the message address of platform msi interrupt controller in PCI Endpoint. Such that, whenever the PCI host writes to the BAR region, it will trigger an IRQ in the EP. Basic working follow as 1. EP function driver call platform_msi_domain_alloc_irqs() alloc a MSI irq from MSI controller with call back function write_msi_msg(); 2. write_msg_msg will config BAR and map to address defined in msi_msg; 3. Host side trigger an IRQ at Endpoint by write to BAR region. Add MSI doorbell support for pci-epf-vntb. Query if system has an MSI controller. Set up doorbell address according to struct msi_msg. So PCI host can write this doorbell address to trigger EP side's IRQ. If no MSI controller exists, fall back to software polling. Signed-off-by: Frank Li --- drivers/pci/endpoint/functions/pci-epf-vntb.c | 146 +++++++++++++++--- 1 file changed, 125 insertions(+), 21 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index 0d744975f815..f770a068e58c 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -44,6 +44,7 @@ #include #include #include +#include static struct workqueue_struct *kpcintb_workqueue; @@ -137,11 +138,14 @@ struct epf_ntb { struct epf_ntb_ctrl *reg; u32 *epf_db; + phys_addr_t epf_db_phys; phys_addr_t vpci_mw_phy[MAX_MW]; void __iomem *vpci_mw_addr[MAX_MW]; struct delayed_work cmd_handler; + + int msi_virqbase; }; #define to_epf_ntb(epf_group) container_of((epf_group), struct epf_ntb, group) @@ -256,11 +260,13 @@ 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 (ntb->epf_db[i]) { - ntb->db |= 1 << (i - 1); - ntb_db_event(&ntb->ntb, i); - ntb->epf_db[i] = 0; + if (!ntb->epf_db_phys) { + for (i = 1; i < ntb->db_count; i++) { + if (ntb->epf_db[i]) { + ntb->db |= 1 << (i - 1); + ntb_db_event(&ntb->ntb, i); + ntb->epf_db[i] = 0; + } } } @@ -518,6 +524,28 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) return 0; } +static int epf_ntb_db_size(struct epf_ntb *ntb) +{ + const struct pci_epc_features *epc_features; + size_t size = sizeof(u32) * ntb->db_count; + u32 align; + + epc_features = pci_epc_get_features(ntb->epf->epc, + ntb->epf->func_no, + ntb->epf->vfunc_no); + align = epc_features->align; + + if (size < 128) + size = 128; + + if (align) + size = ALIGN(size, align); + else + size = roundup_pow_of_two(size); + + return size; +} + /** * epf_ntb_db_bar_init() - Configure Doorbell window BARs * @ntb: NTB device that facilitates communication between HOST and VHOST @@ -539,27 +567,26 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb) ntb->epf->func_no, ntb->epf->vfunc_no); align = epc_features->align; - - if (size < 128) - size = 128; - - if (align) - size = ALIGN(size, align); - else - size = roundup_pow_of_two(size); + size = epf_ntb_db_size(ntb); barno = ntb->epf_ntb_bar[BAR_DB]; + epf_bar = &ntb->epf->bar[barno]; - mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, align, 0); - if (!mw_addr) { - dev_err(dev, "Failed to allocate OB address\n"); - return -ENOMEM; + if (ntb->epf_db_phys) { + mw_addr = NULL; + epf_bar->phys_addr = ntb->epf_db_phys; + epf_bar->barno = barno; + epf_bar->size = size; + } else { + mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, align, 0); + if (!mw_addr) { + dev_err(dev, "Failed to allocate doorbell address\n"); + return -ENOMEM; + } } ntb->epf_db = mw_addr; - epf_bar = &ntb->epf->bar[barno]; - ret = pci_epc_set_bar(ntb->epf->epc, ntb->epf->func_no, ntb->epf->vfunc_no, epf_bar); if (ret) { dev_err(dev, "Doorbell BAR set failed\n"); @@ -728,6 +755,82 @@ static int epf_ntb_init_epc_bar(struct epf_ntb *ntb) return 0; } +static irqreturn_t epf_ntb_interrupt_handler(int irq, void *data) +{ + struct epf_ntb *ntb = data; + int index; + + index = irq - ntb->msi_virqbase; + ntb->db |= 1 << (index - 1); + ntb_db_event(&ntb->ntb, index); + + return IRQ_HANDLED; +} + +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN +static void epf_ntb_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg) +{ + struct epf_ntb *ntb = dev_get_drvdata(desc->dev); + struct epf_ntb_ctrl *reg = ntb->reg; + int size = epf_ntb_db_size(ntb); + u64 addr; + + addr = msg->address_hi; + addr <<= 32; + addr |= msg->address_lo; + + reg->db_data[desc->msi_index] = msg->data; + + if (!desc->msi_index) + ntb->epf_db_phys = round_down(addr, size); + + reg->db_offset[desc->msi_index] = addr - ntb->epf_db_phys; +} + +static void epf_ntb_epc_msi_init(struct epf_ntb *ntb) +{ + struct device *dev = &ntb->epf->dev; + struct irq_domain *domain; + int virq; + int ret; + int i; + + domain = dev_get_msi_domain(ntb->epf->epc->dev.parent); + if (!domain) + return; + + dev_set_msi_domain(dev, domain); + + if (platform_msi_domain_alloc_irqs(&ntb->epf->dev, + ntb->db_count, + epf_ntb_write_msi_msg)) { + dev_err(dev, "Can't allocate MSI, falling back to polling mode\n"); + return; + } + dev_dbg(dev, "Using MSI as doorbell\n"); + + for (i = 0; i < ntb->db_count; i++) { + virq = msi_get_virq(dev, i); + ret = devm_request_irq(dev, virq, + epf_ntb_interrupt_handler, 0, + "pci_epf_vntb", ntb); + + if (ret) { + dev_err(dev, "Failed to request doorbell IRQ! Falling back to polling mode"); + ntb->epf_db_phys = 0; + platform_msi_domain_free_irqs(&ntb->epf->dev); + break; + } + + if (!i) + ntb->msi_virqbase = virq; /* msi start virq number */ + } +} +#else +static void epf_ntb_epc_msi_init(struct epf_ntb *ntb) +{ +} +#endif /* CONFIG_GENERIC_MSI_IRQ_DOMAIN */ /** * epf_ntb_epc_init() - Initialize NTB interface * @ntb: NTB device that facilitates communication between HOST and VHOST @@ -1336,14 +1439,15 @@ static int epf_ntb_bind(struct pci_epf *epf) goto err_bar_alloc; } + epf_set_drvdata(epf, ntb); + epf_ntb_epc_msi_init(ntb); + ret = epf_ntb_epc_init(ntb); if (ret) { dev_err(dev, "Failed to initialize EPC\n"); goto err_bar_alloc; } - epf_set_drvdata(epf, ntb); - pci_space[0] = (ntb->vntb_pid << 16) | ntb->vntb_vid; pci_vntb_table[0].vendor = ntb->vntb_vid; pci_vntb_table[0].device = ntb->vntb_pid;