From patchwork Thu Jul 14 13:48:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: abhimanyu.saini@xilinx.com X-Patchwork-Id: 113977 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 432D9A0032; Thu, 14 Jul 2022 15:48:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85DB042BB4; Thu, 14 Jul 2022 15:48:30 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2072.outbound.protection.outlook.com [40.107.220.72]) by mails.dpdk.org (Postfix) with ESMTP id 2D75242BAF for ; Thu, 14 Jul 2022 15:48:29 +0200 (CEST) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=lyPjdw4leperwMST7QuwwH8szj4cGsCuhCyl+whz/2nQXFAbXM0f8m0sZGXLtZbjFkHzKWgZ4t0fUW95o+BTs4JpNMTaXqAWMz04s0Aph4apS0GmrxD1wyMy5uz2+YZxZy6NIG1iF2mV97FAEzA3PvtCQY1hSDTzpAQK4LQZMwh55nVM+p66oj+zuvNosnhcWrsU/KXGipbjePU/8TcL3ooxSl0rpxYyB1J4pZPWc47cs39maybappZrr0vkvEoQzNms1aXvqP4MijKakcWR/cPW6D0F466+XsZ4aQBRFjf6yDcjxVTEk9cDZXfkGovKeGbzhvlH0cN7Oh2LLD6Oag== ARC-Message-Signature: i=2; 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=bilZLXL3Vf8UTKpgdT+Yiu49wqGAaWaJfyAEJedu4aY=; b=eUstUse0sBcKd+cM68WhW06Xm4cnAmd4I5ejUjGmwDjb5SRx160+IJq9W5wB/oGYzdszGc5NWjL3Neup4uNoVIm4vr5mChVGm/e6Lj4Judw/HQxF0TmNpSszpIBAb7315lXlFV3gmJ0hHlSWSUB4HGxRJQMb1jTYiTUrmqbXwJi8Yd6EY62146iE2ysQJw4arbe0+6gIPoRvfyJC4+w1eo4LyDt1X/cMD3Sa7LNLcYIPfm/WB2xZOEF/uZSIYrxDnfRe2LL1SNrgbGuw88WK8MHOpnUGEYlEKFHEc9Y2yK/znfP7HKceQ1sAMFe1DZFC/Jn4UO5kiC3iq6H2+8cyfA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 20.83.241.18) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=xilinx.com] dmarc=[1,1,header.from=xilinx.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bilZLXL3Vf8UTKpgdT+Yiu49wqGAaWaJfyAEJedu4aY=; b=GPpwCvxfRBYsGr5mpQjWnDlt+Qy1EzujXT1JGvTx5S3bc89tMcPsYvmVH0fFtAL3n25qFg0EpryYqM1w+G52hmMuSgQZpMlCxtgyvuTaaw1dVn2nAuuSda/9khmRuw96kIKXqMYqgYN3IX2Ngx4bqzC+37vSgzoBhH3lad2jY19j2OFOq3ZShz3S4OOwTJlA8FdzOLMVhCJCnoiAg+4myR+7ByaZ5L3GbA8scVRWnogmiko3olrU1roj2vvMmh9QZS8eWKuhwaPACRw9zIthLay6m2Eq4ojCHdnM7vq7Z8sGZx+9S1eM03JK/7Tr5m/UmFg+ooCGdR5cRY6UpX16xg== Received: from MW4P220CA0005.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::10) by CY4PR12MB1205.namprd12.prod.outlook.com (2603:10b6:903:38::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.23; Thu, 14 Jul 2022 13:48:26 +0000 Received: from CO1NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:303:115:cafe::49) by MW4P220CA0005.outlook.office365.com (2603:10b6:303:115::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26 via Frontend Transport; Thu, 14 Jul 2022 13:48:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.83.241.18) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 20.83.241.18 as permitted sender) receiver=protection.outlook.com; client-ip=20.83.241.18; helo=mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; pr=C Received: from mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (20.83.241.18) by CO1NAM11FT026.mail.protection.outlook.com (10.13.175.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:26 +0000 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2042.outbound.protection.outlook.com [104.47.51.42]) by mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (Postfix) with ESMTPS id 6CC1041F5D; Thu, 14 Jul 2022 13:48:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PuSjUnrpPpnN1OMV14HqA1sQG6AjiKQKyvUp/NIQfnODV2Vlia9w4rIifUQpALLCcSbtkJzO264AqaQQQz0qxFdeH7NNBj8nVRDGAOBBlLnfSRzcw2kxZMCAEZQ6T3S8erFJE4Ew8VVVF/Jnu3oDTOU2AwrMYxS0qN/+QoE0pGF1cx4Ju6vpa4qv+MRRYAHri4QPbpaX+CWKA157cyrTkvwram2RH1anQ7z/STnO2NYcayL5p7ynNcgWHqF9a/CI15gw0vlAyTbOMIvev6CxBC+SM7pHbwPGrpwMwi4XVequJaEhg77JXkK9kNiXy4kmvLw82TdVjLLw+4o17jWvrQ== 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=bilZLXL3Vf8UTKpgdT+Yiu49wqGAaWaJfyAEJedu4aY=; b=WYgaikzL+4q8TlkGArNuc4/T5+SpSzRTLU09RMkX+kYGC28d99GY3kDXwElhtN9O6LKFEzD6mEpihMJRt1NNB5kzr4yNHFRqxyEA8CtMJiGMEXg+Cg2DbSnDlt3Kbep42Mm8iRc63Bfy3NLoWVyRKb/VTSHwG6ngtOau2UursmZEf0AvGS+PHFzl+w6Ey1KlqLhk2tXKbg+KUDa53q5uUNUi9no9YV35wGq8552iLCIDz5gfpR/o8ot3LWhBNFGz9YsaTEJfHWeMzezEFyBJZEu06Nhib5RJMiRuyfXCsr6hzJeuvEhfZFMUOJJ8oUY7YwibWZ5ERcSXxfhe+QdoJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=dpdk.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none Received: from BN9PR03CA0127.namprd03.prod.outlook.com (2603:10b6:408:fe::12) by DM6PR02MB5052.namprd02.prod.outlook.com (2603:10b6:5:52::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.13; Thu, 14 Jul 2022 13:48:22 +0000 Received: from BN1NAM02FT006.eop-nam02.prod.protection.outlook.com (2603:10b6:408:fe:cafe::f7) by BN9PR03CA0127.outlook.office365.com (2603:10b6:408:fe::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.22 via Frontend Transport; Thu, 14 Jul 2022 13:48:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by BN1NAM02FT006.mail.protection.outlook.com (10.13.2.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:21 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 14 Jul 2022 06:48:15 -0700 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 14 Jul 2022 06:48:15 -0700 Envelope-to: dev@dpdk.org, chenbo.xia@intel.com, maxime.coquelin@redhat.com, andrew.rybchenko@oktetlabs.ru, absaini@amd.com Received: from [10.170.66.118] (port=50892 helo=xndengvm004118.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1oBzCR-0003Fq-3P; Thu, 14 Jul 2022 06:48:15 -0700 From: To: CC: , , , Abhimanyu Saini Subject: [PATCH v3 3/5] common/sfc_efx/base: use the updated definitions of cidx/pidx Date: Thu, 14 Jul 2022 19:18:02 +0530 Message-ID: <20220714134804.60495-4-asaini@xilinx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20220714134804.60495-1-asaini@xilinx.com> References: <20220714084451.38375-1-asaini@xilinx.com> <20220714134804.60495-1-asaini@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: f73ce39f-7802-4be5-56f7-08da659f8717 X-MS-TrafficTypeDiagnostic: DM6PR02MB5052:EE_|CO1NAM11FT026:EE_|CY4PR12MB1205:EE_ X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Tisx154uIeWq6U3ZyQjO45RhpWIxQaYnEZltJSKwd6/jnOGdNwG2+xLlW7PzpxbD74rUjtVacr7Rc1CIsrVVGETdQQdo7YYpJHcK31L7upkBK3xgj01bgpX/IWa82S9u5pL7boOqscBpEomk4wASG5cy/YiHhHzmDupE2bfycKb3M8SS+2iL9+J3D87twuS9MdD6KlwPNhLVDrYLjyeH033FtvBGoq6HUqyEuiwNdV3IY/X5jeZte1gxtyPXA4lwp1ur7O26ZOAXc/u6XhyQXcM66cd4ubekK5z5nyDEXxlchCO842XcYMbzfXUtYN7OG7TlZSRlDbxtQmE2sDQBbWn8leJLnbJynRmv7OZrcSmwT70pbRjzE8V8VrsZ20cxut+PTkN0R3ppUKJUKgngSe6pGVIKsH+34pOJse+lclFpAAZRg4Obb7c6lcm3QApboO8kZmq6k3aoUxmVkCS5fzkjQaie4ShQj3fFXtZ10TXlEX1ieKWqYgiZsjooO7bvWe6LD4xrQCfzL7AbS4G0zfTgRIxq0nyZChApOBQOgWoeIIkCAtOJZJNKt755CqqtUGwy6cV+TEo7t02nd8bk/K2Kjb385DWZMxkcEL5vCc3j4N6qxMoHq0oMfKUCPSQiL/RJ2a8IJyrPADN+K7JiMRxyLGkPI8rxwoiASJfPbpJPTQfxMrEy2yLcakh7l+58E/iaV+WEl/NMwmFM8V3wS0oOXaPCGJ4A2nQkKC7XcW04+h+AEpgo69N0zsOLrUaYqse3t8G5754La4vy11v6pHabHZ2dl3iwXCvsKAspz1x4agLicd0YKpis+9NgNLjVV3SxwMUNRp64HWqPRTbft58AYdsMEQYpDp0iWVAR3pA= X-Forefront-Antispam-Report-Untrusted: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch01.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(13230016)(4636009)(136003)(39860400002)(346002)(396003)(376002)(46966006)(40470700004)(36840700001)(6916009)(83380400001)(2616005)(316002)(54906003)(336012)(1076003)(47076005)(426003)(186003)(41300700001)(478600001)(40480700001)(7696005)(6666004)(82310400005)(40460700003)(4326008)(5660300002)(8676002)(36860700001)(26005)(7636003)(2876002)(36756003)(70206006)(8936002)(9786002)(2906002)(356005)(82740400003)(70586007)(102446001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB5052 X-MS-Exchange-Transport-CrossTenantHeadersStripped: CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 1ab0ee14-ab20-4086-c472-08da659f843e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oM3yCt2T5VV/mYWm7M9VUq0phUypVmmVKLJ/vUgrDxJZ398bkbaxXoA9x1m2dRsO9fGgBWRttdCnvmZkofmbZbFcZbSmlqI4tvHRIbaDKcpicdISg+9ztAhhnp7uydsE+RPJUgjpr4hNI6YqbQ1r4FoHBlESOSCZhLIWlep2SrIDJ+C5vcnrTB7e/FPkvMcsjRP3T8SgM9kzc6J5l2xszXzS2KxXDbne2rSOTqMY4PXFlavEiTY8h+jRKyJAeSxuH26E7hYzHBZyxQ5+3MmeS10cwCbdsrSIptyfTcYusw/CHjuy2Gxm3Gf9uRs+eu7JJDMWB6naGWv/qSaW1/0j/dV0T0nsIk8AKUaw7FOMCaA5XdjrfPI+9lRyMrfyDjSsYYwOJFR2KhydDF/S2h/BxAi3XkYj2gzMCV6atyRiOA1xjGNsStTFWcz9nkLHwFx9RLlaTlhCXaNSQE1acUI2i5rinhFJGdQ/jKiAhNjJ/Kv1HAoWJIzp4k+DgTm4jam1O4/V0yWUBdXgWLBPn33BvcVulljI7niLVBkOMtawgNHyPjNRcyM8YQZb9BAoQQNRKdG7e3OhL7EydYXrSHV2dBo1mYGXDe1kQsNIJktEFO4mtbqqteca2K7C8hEOl86RkpaXBEFeklI0sC+hI7wIgtToHn0MZVGUNBZi9cNf0r/JXjcFPIYpVDe5qSAuq5NynU8XAQm9ixx5q2W0RFZPG0S+tJwpQFVytOym/cMM+GuDpMOu410gnnLIcgL1OZmD5i/8TSD4ovQ8C8hTbGuSBzMN0fbZf8U1LB8B9nmpyUNWfjunVhzRetLevasQTL2qDhdZGYJ7gV0ilI1kQQ3goWwJHLdlFK0zn77rgkzeVeA= X-Forefront-Antispam-Report: CIP:20.83.241.18; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(376002)(396003)(346002)(136003)(36840700001)(46966006)(83170400001)(81166007)(336012)(8936002)(8676002)(42882007)(9786002)(1076003)(4326008)(54906003)(6916009)(70206006)(316002)(41300700001)(26005)(2616005)(7696005)(5660300002)(6666004)(82740400003)(2876002)(36756003)(83380400001)(478600001)(82310400005)(40480700001)(2906002)(426003)(186003)(36860700001)(47076005)(102446001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 13:48:26.6536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f73ce39f-7802-4be5-56f7-08da659f8717 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[20.83.241.18]; Helo=[mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1205 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Abhimanyu Saini Change cidx and pidx definition to mean used queue and avail queue index respectively. Signed-off-by: Abhimanyu Saini Acked-by: Andrew Rybchenko --- v2: * Fix checkpatch warnings * Add a cover letter v3: * Restructure patchset drivers/common/sfc_efx/base/efx.h | 12 ++++++------ drivers/common/sfc_efx/base/rhead_virtio.c | 16 ++++++++-------- drivers/vdpa/sfc/sfc_vdpa_ops.c | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h index 95f5fb6..c19205c 100644 --- a/drivers/common/sfc_efx/base/efx.h +++ b/drivers/common/sfc_efx/base/efx.h @@ -4886,17 +4886,17 @@ extern __checkReturn __success(return != B_FALSE) boolean_t typedef struct efx_virtio_vq_dyncfg_s { /* - * If queue is being created to be migrated then this - * should be the FINAL_PIDX value returned by MC_CMD_VIRTIO_FINI_QUEUE + * If queue is being created to be migrated then this should be + * the FINAL_AVAIL_IDX value returned by MC_CMD_VIRTIO_FINI_QUEUE * of the queue being migrated from. Otherwise, it should be zero. */ - uint32_t evvd_vq_pidx; + uint32_t evvd_vq_avail_idx; /* - * If this queue is being created to be migrated then this - * should be the FINAL_CIDX value returned by MC_CMD_VIRTIO_FINI_QUEUE + * If queue is being created to be migrated then this should be + * the FINAL_USED_IDX value returned by MC_CMD_VIRTIO_FINI_QUEUE * of the queue being migrated from. Otherwise, it should be zero. */ - uint32_t evvd_vq_cidx; + uint32_t evvd_vq_used_idx; } efx_virtio_vq_dyncfg_t; /* diff --git a/drivers/common/sfc_efx/base/rhead_virtio.c b/drivers/common/sfc_efx/base/rhead_virtio.c index 7f08717..5a2ebe8 100644 --- a/drivers/common/sfc_efx/base/rhead_virtio.c +++ b/drivers/common/sfc_efx/base/rhead_virtio.c @@ -95,10 +95,10 @@ evvcp->evcc_features >> 32); if (evvdp != NULL) { - MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_PIDX, - evvdp->evvd_vq_pidx); - MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_CIDX, - evvdp->evvd_vq_cidx); + MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_AVAIL_IDX, + evvdp->evvd_vq_avail_idx); + MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_USED_IDX, + evvdp->evvd_vq_used_idx); } MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_MPORT_SELECTOR, @@ -161,10 +161,10 @@ } if (evvdp != NULL) { - evvdp->evvd_vq_pidx = - MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_PIDX); - evvdp->evvd_vq_cidx = - MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_CIDX); + evvdp->evvd_vq_avail_idx = + MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_AVAIL_IDX); + evvdp->evvd_vq_used_idx = + MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_USED_IDX); } return (0); diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c index b84699d..e2f119b 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -258,8 +258,8 @@ vq_cfg.evvc_used_ring_addr = vring.used; vq_cfg.evvc_vq_size = vring.size; - vq_dyncfg.evvd_vq_pidx = vring.last_used_idx; - vq_dyncfg.evvd_vq_cidx = vring.last_avail_idx; + vq_dyncfg.evvd_vq_used_idx = vring.last_used_idx; + vq_dyncfg.evvd_vq_avail_idx = vring.last_avail_idx; /* MSI-X vector is function-relative */ vq_cfg.evvc_msix_vector = RTE_INTR_VEC_RXTX_OFFSET + vq_num; @@ -321,8 +321,8 @@ /* stop the vq */ rc = efx_virtio_qstop(vq, &vq_idx); if (rc == 0) { - ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_cidx; - ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_pidx; + ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_used_idx; + ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_avail_idx; } ops_data->vq_cxt[vq_num].enable = B_FALSE;