From patchwork Fri Apr 12 12:28:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 52699 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CA2A41B11F; Fri, 12 Apr 2019 14:29:00 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80088.outbound.protection.outlook.com [40.107.8.88]) by dpdk.org (Postfix) with ESMTP id 97A357D4A for ; Fri, 12 Apr 2019 14:28:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QGpRWQeUWo1OGZOOUIYnGI+KQ4yfbHGjU+BBURNvUNs=; b=cW7qgRNzafGyXpZPY9out1c8OmWREgBs7hZAqMfaG8n8EYf0NkoPWIKOOwrwbUaZhU/YwWQVqvk5R7L4KBBj6n13S0yw831Sfcp4shrB+Z/pbsZzwKpHE3AWID1BPKc1PFdM2jNvDdE1Lhl8UZSpyAdAPb5UAJDdzZ5uM9dJRXc= Received: from VE1PR04MB6365.eurprd04.prod.outlook.com (10.255.118.78) by VE1PR04MB6367.eurprd04.prod.outlook.com (10.255.118.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1792.15; Fri, 12 Apr 2019 12:28:53 +0000 Received: from VE1PR04MB6365.eurprd04.prod.outlook.com ([fe80::f5ad:f178:4c55:13e0]) by VE1PR04MB6365.eurprd04.prod.outlook.com ([fe80::f5ad:f178:4c55:13e0%3]) with mapi id 15.20.1792.016; Fri, 12 Apr 2019 12:28:53 +0000 From: Gagandeep Singh To: "dev@dpdk.org" , "ferruh.yigit@intel.com" CC: Gagandeep Singh Thread-Topic: [PATCH v4 01/13] net/enetc: support physical addressing mode Thread-Index: AQHU8StKkKp0fttOpkiMjmvBko09zw== Date: Fri, 12 Apr 2019 12:28:53 +0000 Message-ID: <20190412122840.1908-2-g.singh@nxp.com> References: <20190412105105.24351-1-g.singh@nxp.com> <20190412122840.1908-1-g.singh@nxp.com> In-Reply-To: <20190412122840.1908-1-g.singh@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BMXPR01CA0029.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::15) To VE1PR04MB6365.eurprd04.prod.outlook.com (2603:10a6:803:12a::14) x-mailer: git-send-email 2.19.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [92.120.0.8] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 04affc15-b91c-46ed-248e-08d6bf426c7d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:VE1PR04MB6367; x-ms-traffictypediagnostic: VE1PR04MB6367: x-microsoft-antispam-prvs: x-forefront-prvs: 0005B05917 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(396003)(39860400002)(366004)(136003)(189003)(199004)(476003)(99286004)(1076003)(8936002)(2501003)(5660300002)(186003)(6486002)(97736004)(3846002)(6436002)(106356001)(6116002)(7736002)(6506007)(102836004)(386003)(305945005)(256004)(446003)(76176011)(2616005)(105586002)(26005)(71190400001)(53936002)(36756003)(66066001)(25786009)(8676002)(486006)(11346002)(14454004)(50226002)(71200400001)(81156014)(6512007)(86362001)(2906002)(316002)(478600001)(110136005)(72206003)(4326008)(52116002)(68736007)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:VE1PR04MB6367; H:VE1PR04MB6365.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: CEKqj4y6Zo3u6HEo+dG+kyNES8YIpak70PLeBoU3AXBAv7Oj7fehLc6slfLWx0fGv6S5h8M3AJbGtEmZOEKvofl0GZ3wtsFWawyfCaZos/BlleZtkqUwQmnHK4twIn1YJOqIRwpauz00mTInpjZ+aVG4KjwZfqn0QZvz/zcF+qzOg/h/i8Zc1f6QZN5ngQVrW8mX6t1mVWI/XhMkK6OGuHSItifjVHsr90LKvNN9SorefyAhqOYlqTR9PNGjuyhvJx8EFMQjD5EcEsyEVk73i7RV0+jRQtZ7n5qFgpjqKFXdgFs3XR2aWLEdS1u05crGRvtzNaZA8OmHMpNoKsl16edQakU4njOYNRvt+VCtp3MvnwCkHDClEYW9ZVby49J9jeBTdDUquz/F4CxpgpiWpRPgaJCwXIgj5KSuaP7FHMg= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04affc15-b91c-46ed-248e-08d6bf426c7d X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Apr 2019 12:28:53.1994 (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-Transport-CrossTenantHeadersStamped: VE1PR04MB6367 Subject: [dpdk-dev] [PATCH v4 01/13] net/enetc: support physical addressing mode X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Support added for physical addressing mode and change driver flags to don't care. Signed-off-by: Gagandeep Singh --- drivers/net/enetc/enetc_ethdev.c | 22 ++++++++++++---------- drivers/net/enetc/enetc_rxtx.c | 6 +++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c index 023fe7517..7a9a97deb 100644 --- a/drivers/net/enetc/enetc_ethdev.c +++ b/drivers/net/enetc/enetc_ethdev.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2018 NXP + * Copyright 2018-2019 NXP */ #include @@ -334,14 +334,15 @@ static void enetc_setup_txbdr(struct enetc_hw *hw, struct enetc_bdr *tx_ring) { int idx = tx_ring->index; - uintptr_t base_addr; uint32_t tbmr; + phys_addr_t bd_address; - base_addr = (uintptr_t)tx_ring->bd_base; + bd_address = (phys_addr_t) + rte_mem_virt2iova((const void *)tx_ring->bd_base); enetc_txbdr_wr(hw, idx, ENETC_TBBAR0, - lower_32_bits((uint64_t)base_addr)); + lower_32_bits((uint64_t)bd_address)); enetc_txbdr_wr(hw, idx, ENETC_TBBAR1, - upper_32_bits((uint64_t)base_addr)); + upper_32_bits((uint64_t)bd_address)); enetc_txbdr_wr(hw, idx, ENETC_TBLENR, ENETC_RTBLENR_LEN(tx_ring->bd_count)); @@ -478,14 +479,15 @@ enetc_setup_rxbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring, struct rte_mempool *mb_pool) { int idx = rx_ring->index; - uintptr_t base_addr; uint16_t buf_size; + phys_addr_t bd_address; - base_addr = (uintptr_t)rx_ring->bd_base; + bd_address = (phys_addr_t) + rte_mem_virt2iova((const void *)rx_ring->bd_base); enetc_rxbdr_wr(hw, idx, ENETC_RBBAR0, - lower_32_bits((uint64_t)base_addr)); + lower_32_bits((uint64_t)bd_address)); enetc_rxbdr_wr(hw, idx, ENETC_RBBAR1, - upper_32_bits((uint64_t)base_addr)); + upper_32_bits((uint64_t)bd_address)); enetc_rxbdr_wr(hw, idx, ENETC_RBLENR, ENETC_RTBLENR_LEN(rx_ring->bd_count)); @@ -612,7 +614,7 @@ enetc_pci_remove(struct rte_pci_device *pci_dev) static struct rte_pci_driver rte_enetc_pmd = { .id_table = pci_id_enetc_map, - .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_IOVA_AS_VA, + .drv_flags = RTE_PCI_DRV_NEED_MAPPING, .probe = enetc_pci_probe, .remove = enetc_pci_remove, }; diff --git a/drivers/net/enetc/enetc_rxtx.c b/drivers/net/enetc/enetc_rxtx.c index 631e2430d..a31a38725 100644 --- a/drivers/net/enetc/enetc_rxtx.c +++ b/drivers/net/enetc/enetc_rxtx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2018 NXP + * Copyright 2018-2019 NXP */ #include @@ -64,7 +64,7 @@ enetc_xmit_pkts(void *tx_queue, txbd->buf_len = txbd->frm_len; txbd->flags = rte_cpu_to_le_16(ENETC_TXBD_FLAGS_F); txbd->addr = (uint64_t)(uintptr_t) - rte_cpu_to_le_64((size_t)tx_swbd->buffer_addr->buf_addr + + rte_cpu_to_le_64((size_t)tx_swbd->buffer_addr->buf_iova + tx_swbd->buffer_addr->data_off); i++; start++; @@ -91,7 +91,7 @@ enetc_refill_rx_ring(struct enetc_bdr *rx_ring, const int buff_cnt) rx_swbd->buffer_addr = rte_cpu_to_le_64(rte_mbuf_raw_alloc(rx_ring->mb_pool)); rxbd->w.addr = (uint64_t)(uintptr_t) - rx_swbd->buffer_addr->buf_addr + + rx_swbd->buffer_addr->buf_iova + rx_swbd->buffer_addr->data_off; /* clear 'R" as well */ rxbd->r.lstatus = 0;