From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E47DCA0560; Tue, 18 Oct 2022 21:44:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D757840A8B; Tue, 18 Oct 2022 21:44:33 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2044.outbound.protection.outlook.com [40.107.220.44]) by mails.dpdk.org (Postfix) with ESMTP id 180C240395 for ; Tue, 18 Oct 2022 21:44:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZd71DGldKyQOIDP/feNVHy6tps9a72Dwt8/ZebDc93jzxx5wS7ozno2gTHcrR+wJX3AajkKB6W4UMXbq09veCtN2x8ln4th22swHzIBSiaDjxwN9VEwI2zrX65dpDBBpyws6tCLhX2PB3YC0NshR2F8TcGEJX4w94fH6Yi2Fn9JP+s2bXUF05XMm3FgPWCqpMddBIdHNKTUQFka3s2bZ6h5+zpebk+u2yiEbJANTDnQQDCdou8JqMh9mOT1OWkH6IRFahV+mrxtvBYPU4Ff1F97qUMnV011EPToHd1oQhll9Ngi6mKZHdZaYPnjtLsM8CT2pfhxlXJfsF4rtx+wJQ== 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=hfH/w3UZI8f4QPFSBiSCxmpZlHZQ/PUZ8TbK9OBmAeM=; b=huvdDim2UnkwaXGZ5BC67OYiN2ZHMUnwbirY1m+LpHyqEyGrVRt6eZSYylLBfEZTkMLxjFWXvZpXi8E8cmW/FN2kvad7q8iH/6uFQTxX/NXVDgbVr7SwYkQ/vcjqQksX41/YxfT/oIi7lzs+F2faBCPDQIkHHMNyi4NvaGYtYRMvHZir7l9GbRW4skWFbBtuS1u2UuxPEJIQz8lFmbmSXDaenMFqmyCTrafWcJ09mx5aUL61niEREd2i4dencICXoH4IYvctZZwZUGtS5LfEKYEO2h/E4VWAgaB47f/2mNyaQrflOWFzCrRLzznInA2raJQ2rMXPrMjl//cjgvn90w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hfH/w3UZI8f4QPFSBiSCxmpZlHZQ/PUZ8TbK9OBmAeM=; b=zHf2WpweVvr1JS2b1+5bMqp/G0DWRkbL0Tm+x6xqsFwu96KfWcS+wt5pAan+ps7G+judwdz2P58oFwL1sWJhSVzdIjfOpyiyvlf0hpPXJjZQCmaJK7MYJhSVWwQ/0oAtRcSHn8yYyv+kxSAObKO8zGymw/grE4XHvoJfEeg9MNw= Received: from DM6PR11CA0012.namprd11.prod.outlook.com (2603:10b6:5:190::25) by DM6PR12MB4878.namprd12.prod.outlook.com (2603:10b6:5:1b8::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Tue, 18 Oct 2022 19:44:31 +0000 Received: from DM6NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:5:190:cafe::80) by DM6PR11CA0012.outlook.office365.com (2603:10b6:5:190::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30 via Frontend Transport; Tue, 18 Oct 2022 19:44:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT006.mail.protection.outlook.com (10.13.173.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5723.20 via Frontend Transport; Tue, 18 Oct 2022 19:44:31 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 18 Oct 2022 14:44:29 -0500 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v2 10/36] net/ionic: simplify code by removing doorbell map helper Date: Tue, 18 Oct 2022 12:41:05 -0700 Message-ID: <20221018194131.23006-11-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221011005032.47584-1-andrew.boyer@amd.com> References: <20221011005032.47584-1-andrew.boyer@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT006:EE_|DM6PR12MB4878:EE_ X-MS-Office365-Filtering-Correlation-Id: 561f3bc8-fc89-40ad-ed0d-08dab1412ce6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +lgLvSUrz/hqAkr/OUTY5mKAKHRncDjmadXju6hS+gNarHPSkQzsEjkTTX3wqGkCvyS6I3qXCGCgA5xIF7qk4F0MVCYPglaMjta36y2Ac33JGmRRepYF/bu/oeHc6gQM6rOtC9jzZfviJnh8Xbj+uRwrjAkQ+W3kdvtCX+aRSRLz/BQCG4l2XYHWYeHxX4stNuIuJilAfp5VnTT9AiH0JUglx0Xgb19QRBremMBT/BKajXQ2TFI7XBvfrXZ7LPv2Jtg6E5RVmpcPZdc2rptBlN6+G7zueI4yEaYVcgqEffbQBI2FqOIz6bx7FTGMi44U7tMEdZnZiNAk1VAsqZMxhwsZ+jyUpcJrdRc81YlOmyl3/S2ZhB1wlybc0KE5wrohgjo9nc3uTtZaqC3cgZqlcsrjzOqYoNlcELUtVMO8dt8cupvIQ+TvuXAfj79ja78W3r8xHNw2F4wSeISBq2PmsmafRaolcFbGtbzSqD5ceUl3lo0uHaZw7wWBFjSrzigNgIsVgZrI6/ffQqxgLBCkDphjzhaKcyfUfKTcNXIDoVYvBnz76ed/ylyfBYdHg5ww7Telmn5q/3otQMrlnfngivYkD9zyfWobdK+rkUfqdW6s82JD7SBq+DshLmp2F5Ho3jgWE3hauSHHIaEhdmEZCtCGDC5fV96MMCwknACw86L396WiuMT6viEfMumE5BaU/j2rJI9NrhPbPvpALIRA5FRYlNGqO+sUTtb4jhJadkUKvzBIiamHbSIohE1qN0oNybChdcwyPXjbrjwlKOvcsh/9YZ0PEwLjkw8G680JJaPD2AtDmUKQaEp593HBuqKT X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(136003)(376002)(346002)(396003)(39860400002)(451199015)(40470700004)(36840700001)(46966006)(36756003)(36860700001)(86362001)(5660300002)(82740400003)(44832011)(2906002)(2616005)(47076005)(186003)(1076003)(426003)(16526019)(336012)(81166007)(83380400001)(356005)(316002)(478600001)(26005)(41300700001)(6666004)(6916009)(70586007)(70206006)(82310400005)(8936002)(40480700001)(4326008)(8676002)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 19:44:31.0043 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 561f3bc8-fc89-40ad-ed0d-08dab1412ce6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4878 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 There is only one doorbell page in DPDK configurations, so no helper function is needed. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_lif.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 13c763407c..637473cca5 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -846,17 +846,6 @@ ionic_notify_qcq_alloc(struct ionic_lif *lif) return 0; } -static void * -ionic_bus_map_dbpage(struct ionic_adapter *adapter, int page_num) -{ - char *vaddr = adapter->bars[IONIC_PCI_BAR_DBELL].vaddr; - - if (adapter->num_bars <= IONIC_PCI_BAR_DBELL) - return NULL; - - return (void *)&vaddr[page_num << PAGE_SHIFT]; -} - static void ionic_lif_queue_identify(struct ionic_lif *lif) { @@ -959,7 +948,7 @@ ionic_lif_alloc(struct ionic_lif *lif) rte_spinlock_init(&lif->adminq_lock); rte_spinlock_init(&lif->adminq_service_lock); - lif->kern_dbpage = ionic_bus_map_dbpage(adapter, 0); + lif->kern_dbpage = adapter->idev.db_pages; if (!lif->kern_dbpage) { IONIC_PRINT(ERR, "Cannot map dbpage, aborting"); return -ENOMEM; -- 2.17.1