Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/52671/?format=api
{ "id": 52671, "url": "http://patches.dpdk.org/api/patches/52671/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1555075598-4988-7-git-send-email-g.singh@nxp.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1555075598-4988-7-git-send-email-g.singh@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1555075598-4988-7-git-send-email-g.singh@nxp.com", "date": "2019-04-12T07:04:14", "name": "[v2,06/13] net/enetc: replace register read/write macros with functions", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "75bce4838b4ddd709d62229b9a45f15711c0e223", "submitter": { "id": 1068, "url": "http://patches.dpdk.org/api/people/1068/?format=api", "name": "Gagandeep Singh", "email": "g.singh@nxp.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1555075598-4988-7-git-send-email-g.singh@nxp.com/mbox/", "series": [ { "id": 4274, "url": "http://patches.dpdk.org/api/series/4274/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4274", "date": "2019-04-12T07:04:02", "name": "ENETC PMD basic features and bug fixes", "version": 2, "mbox": "http://patches.dpdk.org/series/4274/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/52671/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/52671/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F00BB5B1C;\n\tFri, 12 Apr 2019 09:04:32 +0200 (CEST)", "from EUR04-VI1-obe.outbound.protection.outlook.com\n\t(mail-eopbgr80078.outbound.protection.outlook.com [40.107.8.78])\n\tby dpdk.org (Postfix) with ESMTP id D50974C8F\n\tfor <dev@dpdk.org>; Fri, 12 Apr 2019 09:04:15 +0200 (CEST)", "from VE1PR04MB6365.eurprd04.prod.outlook.com (10.255.118.78) by\n\tVE1PR04MB6461.eurprd04.prod.outlook.com (20.179.233.18) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.1792.17; Fri, 12 Apr 2019 07:04:14 +0000", "from VE1PR04MB6365.eurprd04.prod.outlook.com\n\t([fe80::f5ad:f178:4c55:13e0]) by\n\tVE1PR04MB6365.eurprd04.prod.outlook.com\n\t([fe80::f5ad:f178:4c55:13e0%3]) with mapi id 15.20.1792.016;\n\tFri, 12 Apr 2019 07:04:14 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=aqCl+0c5enr2SVKrmXPkybgaE7Exio66vOZgzaphGn0=;\n\tb=gqOVTxqfRQkLq64HOOtuW+WhOdf69mgYVmtznnmyR5dMYtEw0avoOs/C09y4yAtKV3bgxD9yJ6KT/EbtHXU0j0OcCTj69BBO4NrvSRe+/Du/O93TT144QkxdVbG4Wp6tevlWvDOnZPaUVbGWSoDKKp1LqgQzCVIIDWW4wvBWcq8=", "From": "Gagandeep Singh <G.Singh@nxp.com>", "To": "\"dev@dpdk.org\" <dev@dpdk.org>, \"ferruh.yigit@intel.com\"\n\t<ferruh.yigit@intel.com>", "CC": "\"thomas@monjalon.net\" <thomas@monjalon.net>, Gagandeep Singh\n\t<G.Singh@nxp.com>", "Thread-Topic": "[PATCH v2 06/13] net/enetc: replace register read/write macros\n\twith functions", "Thread-Index": "AQHU8P3v3rqTZtNCPU6fNYmlTaAeUw==", "Date": "Fri, 12 Apr 2019 07:04:14 +0000", "Message-ID": "<1555075598-4988-7-git-send-email-g.singh@nxp.com>", "References": "<1554745507-15089-1-git-send-email-g.singh@nxp.com>\n\t<1555075598-4988-1-git-send-email-g.singh@nxp.com>", "In-Reply-To": "<1555075598-4988-1-git-send-email-g.singh@nxp.com>", "Accept-Language": "en-US", "Content-Language": "en-US", "X-MS-Has-Attach": "", "X-MS-TNEF-Correlator": "", "x-clientproxiedby": "BM1PR0101CA0038.INDPRD01.PROD.OUTLOOK.COM\n\t(2603:1096:b00:1a::24) To VE1PR04MB6365.eurprd04.prod.outlook.com\n\t(2603:10a6:803:12a::14)", "x-mailer": "git-send-email 1.9.1", "authentication-results": "spf=none (sender IP is )\n\tsmtp.mailfrom=G.Singh@nxp.com; ", "x-ms-exchange-messagesentrepresentingtype": "1", "x-originating-ip": "[92.120.1.67]", "x-ms-publictraffictype": "Email", "x-ms-office365-filtering-correlation-id": "0d3f8f8b-e99b-4c91-af37-08d6bf15120e", "x-ms-office365-filtering-ht": "Tenant", "x-microsoft-antispam": "BCL:0; PCL:0;\n\tRULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020);\n\tSRVR:VE1PR04MB6461; ", "x-ms-traffictypediagnostic": "VE1PR04MB6461:", "x-microsoft-antispam-prvs": "<VE1PR04MB64614FD5F84D625BB5F5F2D8E1280@VE1PR04MB6461.eurprd04.prod.outlook.com>", "x-forefront-prvs": "0005B05917", "x-forefront-antispam-report": "SFV:NSPM;\n\tSFS:(10009020)(136003)(39860400002)(376002)(366004)(396003)(346002)(189003)(199004)(6512007)(102836004)(256004)(86362001)(36756003)(486006)(25786009)(6486002)(2501003)(26005)(386003)(2906002)(66066001)(7736002)(71190400001)(14454004)(71200400001)(6506007)(53936002)(97736004)(186003)(76176011)(8676002)(52116002)(105586002)(106356001)(99286004)(446003)(81166006)(81156014)(72206003)(478600001)(50226002)(11346002)(476003)(2616005)(6116002)(54906003)(5660300002)(110136005)(4326008)(316002)(8936002)(6436002)(68736007)(3846002)(305945005);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:VE1PR04MB6461;\n\tH:VE1PR04MB6365.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en;\n\tPTR:InfoNoRecords; MX:1; A:1; ", "received-spf": "None (protection.outlook.com: nxp.com does not designate\n\tpermitted sender hosts)", "x-ms-exchange-senderadcheck": "1", "x-microsoft-antispam-message-info": "XSQ2abpOMnHlc5Qzza01KToLF+cMpC7SD6e0L1YXn09STR8Fu30Omv6XHaLNFTpl+4WhHsnhGL0KVWvRXTyhJe9yGtBKIZIkET91iE9zB9zvhCBI0/Ppfi56JLGYhUCm2R7MNmkH3gHmUFVEYbKD91pTll7Y0i0zks1FnOKhnZfJYBuAQkkTp7wSWhLEaSNwJGI8bzv186PKRyMt+o35jWA82IWzkdck7URicqg4coTlSEEQaaEokoLseCs2hrxxN7MGKWX+Dj9RjQIdeq4TMmV5f/JQlrYj58mpMLcXvFMSdLTl5Lgw7bW8BKoUTmu7iwdDzrKCuVbGU9pcGPErRfON1P1i0FMlSlIhAUUyWaDefX/U1b90I744CAVs+pXDUMngGs2sygBbkBRbJ7x6o6UUATUKEi2UOH6QpbF+CvQ=", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "MIME-Version": "1.0", "X-OriginatorOrg": "nxp.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "0d3f8f8b-e99b-4c91-af37-08d6bf15120e", "X-MS-Exchange-CrossTenant-originalarrivaltime": "12 Apr 2019 07:04:14.2768\n\t(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": "VE1PR04MB6461", "Subject": "[dpdk-dev] [PATCH v2 06/13] net/enetc: replace register read/write\n\tmacros with functions", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Replacing read-write macros with already available\nread-write functions.\n\nSigned-off-by: Gagandeep Singh <g.singh@nxp.com>\n---\n drivers/net/enetc/enetc.h | 7 +----\n drivers/net/enetc/enetc_ethdev.c | 61 ++++++++++++++++++++--------------------\n 2 files changed, 31 insertions(+), 37 deletions(-)", "diff": "diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h\r\nindex 0e80d1c..56454dc 100644\r\n--- a/drivers/net/enetc/enetc.h\r\n+++ b/drivers/net/enetc/enetc.h\r\n@@ -1,5 +1,5 @@\r\n /* SPDX-License-Identifier: BSD-3-Clause\r\n- * Copyright 2018 NXP\r\n+ * Copyright 2018-2019 NXP\r\n */\r\n \r\n #ifndef _ENETC_H_\r\n@@ -86,11 +86,6 @@ struct enetc_eth_adapter {\r\n #define ENETC_DEV_PRIVATE_TO_INTR(adapter) \\\r\n \t(&((struct enetc_eth_adapter *)adapter)->intr)\r\n \r\n-#define ENETC_GET_HW_ADDR(reg, addr) ((void *)(((size_t)reg) + (addr)))\r\n-#define ENETC_REG_READ(addr) (*(uint32_t *)addr)\r\n-#define ENETC_REG_WRITE(addr, val) (*(uint32_t *)addr = val)\r\n-#define ENETC_REG_WRITE_RELAXED(addr, val) (*(uint32_t *)addr = val)\r\n-\r\n /*\r\n * RX/TX ENETC function prototypes\r\n */\r\ndiff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c\r\nindex 10b2b39..2d8c4e6 100644\r\n--- a/drivers/net/enetc/enetc_ethdev.c\r\n+++ b/drivers/net/enetc/enetc_ethdev.c\r\n@@ -131,28 +131,31 @@ static int enetc_stats_get(struct rte_eth_dev *dev,\r\n {\r\n \tstruct enetc_eth_hw *hw =\r\n \t\tENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);\r\n+\tstruct enetc_hw *enetc_hw = &hw->hw;\r\n \tuint32_t val;\r\n \r\n \tPMD_INIT_FUNC_TRACE();\r\n-\tval = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port,\r\n-\t\t\t ENETC_PM0_CMD_CFG));\r\n-\tENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PM0_CMD_CFG),\r\n-\t\t\tval | ENETC_PM0_TX_EN | ENETC_PM0_RX_EN);\r\n+\tval = enetc_port_rd(enetc_hw, ENETC_PM0_CMD_CFG);\r\n+\tenetc_port_wr(enetc_hw, ENETC_PM0_CMD_CFG,\r\n+\t\t val | ENETC_PM0_TX_EN | ENETC_PM0_RX_EN);\r\n \r\n \t/* Enable port */\r\n-\tval = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR));\r\n-\tENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR),\r\n-\t\t\tval | ENETC_PMR_EN);\r\n+\tval = enetc_port_rd(enetc_hw, ENETC_PMR);\r\n+\tenetc_port_wr(enetc_hw, ENETC_PMR, val | ENETC_PMR_EN);\r\n \r\n \t/* set auto-speed for RGMII */\r\n-\tif (enetc_port_rd(&hw->hw, ENETC_PM0_IF_MODE) & ENETC_PMO_IFM_RG) {\r\n-\t\tenetc_port_wr(&hw->hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_RGAUTO);\r\n-\t\tenetc_port_wr(&hw->hw, ENETC_PM1_IF_MODE, ENETC_PM0_IFM_RGAUTO);\r\n+\tif (enetc_port_rd(enetc_hw, ENETC_PM0_IF_MODE) & ENETC_PMO_IFM_RG) {\r\n+\t\tenetc_port_wr(enetc_hw, ENETC_PM0_IF_MODE,\r\n+\t\t\t ENETC_PM0_IFM_RGAUTO);\r\n+\t\tenetc_port_wr(enetc_hw, ENETC_PM1_IF_MODE,\r\n+\t\t\t ENETC_PM0_IFM_RGAUTO);\r\n \t}\r\n-\tif (enetc_global_rd(&hw->hw,\r\n+\tif (enetc_global_rd(enetc_hw,\r\n \t\t\t ENETC_G_EPFBLPR(1)) == ENETC_G_EPFBLPR1_XGMII) {\r\n-\t\tenetc_port_wr(&hw->hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_XGMII);\r\n-\t\tenetc_port_wr(&hw->hw, ENETC_PM1_IF_MODE, ENETC_PM0_IFM_XGMII);\r\n+\t\tenetc_port_wr(enetc_hw, ENETC_PM0_IF_MODE,\r\n+\t\t\t ENETC_PM0_IFM_XGMII);\r\n+\t\tenetc_port_wr(enetc_hw, ENETC_PM1_IF_MODE,\r\n+\t\t\t ENETC_PM0_IFM_XGMII);\r\n \t}\r\n \r\n \treturn 0;\r\n@@ -163,18 +166,17 @@ static int enetc_stats_get(struct rte_eth_dev *dev,\r\n {\r\n \tstruct enetc_eth_hw *hw =\r\n \t\tENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);\r\n+\tstruct enetc_hw *enetc_hw = &hw->hw;\r\n \tuint32_t val;\r\n \r\n \tPMD_INIT_FUNC_TRACE();\r\n \t/* Disable port */\r\n-\tval = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR));\r\n-\tENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR),\r\n-\t\t\tval & (~ENETC_PMR_EN));\r\n-\r\n-\tval = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port,\r\n-\t\t\t ENETC_PM0_CMD_CFG));\r\n-\tENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PM0_CMD_CFG),\r\n-\t\t\tval & (~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN)));\r\n+\tval = enetc_port_rd(enetc_hw, ENETC_PMR);\r\n+\tenetc_port_wr(enetc_hw, ENETC_PMR, val & (~ENETC_PMR_EN));\r\n+\r\n+\tval = enetc_port_rd(enetc_hw, ENETC_PM0_CMD_CFG);\r\n+\tenetc_port_wr(enetc_hw, ENETC_PM0_CMD_CFG,\r\n+\t\t val & (~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN)));\r\n }\r\n \r\n static void\r\n@@ -221,6 +223,7 @@ static int enetc_stats_get(struct rte_eth_dev *dev,\r\n {\r\n \tstruct enetc_eth_hw *hw =\r\n \t\tENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);\r\n+\tstruct enetc_hw *enetc_hw = &hw->hw;\r\n \tstruct rte_eth_link link;\r\n \tuint32_t status;\r\n \r\n@@ -228,8 +231,7 @@ static int enetc_stats_get(struct rte_eth_dev *dev,\r\n \r\n \tmemset(&link, 0, sizeof(link));\r\n \r\n-\tstatus = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port,\r\n-\t\t\t\tENETC_PM0_STATUS));\r\n+\tstatus = enetc_port_rd(enetc_hw, ENETC_PM0_STATUS);\r\n \r\n \tif (status & ENETC_LINK_MODE)\r\n \t\tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\r\n@@ -262,6 +264,7 @@ static int enetc_stats_get(struct rte_eth_dev *dev,\r\n enetc_hardware_init(struct enetc_eth_hw *hw)\r\n {\r\n \tuint32_t psipmr = 0;\r\n+\tstruct enetc_hw *enetc_hw = &hw->hw;\r\n \r\n \tPMD_INIT_FUNC_TRACE();\r\n \t/* Calculating and storing the base HW addresses */\r\n@@ -269,8 +272,7 @@ static int enetc_stats_get(struct rte_eth_dev *dev,\r\n \thw->hw.global = (void *)((size_t)hw->hw.reg + ENETC_GLOBAL_BASE);\r\n \r\n \t/* Enabling Station Interface */\r\n-\tENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.reg, ENETC_SIMR),\r\n-\t\t\t\t\t ENETC_SIMR_EN);\r\n+\tenetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);\r\n \r\n \t/* Setting to accept broadcast packets for each inetrface */\r\n \tpsipmr |= ENETC_PSIPMR_SET_UP(0) | ENETC_PSIPMR_SET_MP(0) |\r\n@@ -280,14 +282,11 @@ static int enetc_stats_get(struct rte_eth_dev *dev,\r\n \tpsipmr |= ENETC_PSIPMR_SET_UP(2) | ENETC_PSIPMR_SET_MP(2) |\r\n \t\t ENETC_PSIPMR_SET_VLAN_MP(2);\r\n \r\n-\tENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMR),\r\n-\t\t\tpsipmr);\r\n+\tenetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);\r\n \r\n \t/* Enabling broadcast address */\r\n-\tENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMAR0(0)),\r\n-\t\t\t0xFFFFFFFF);\r\n-\tENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMAR1(0)),\r\n-\t\t\t0xFFFF << 16);\r\n+\tenetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), 0xFFFFFFFF);\r\n+\tenetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), 0xFFFF << 16);\r\n \r\n \treturn 0;\r\n }\r\n", "prefixes": [ "v2", "06/13" ] }