From patchwork Tue Jan 17 07:13:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob X-Patchwork-Id: 19523 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 772BBFA48; Tue, 17 Jan 2017 08:16:28 +0100 (CET) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0073.outbound.protection.outlook.com [104.47.42.73]) by dpdk.org (Postfix) with ESMTP id C4407D592 for ; Tue, 17 Jan 2017 08:16:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=PwKLpZtBp8UPzc+KRePKPyAinFeZZ3YSq8hqfJv8nME=; b=F5IkNsPQVgtXoP9W3A9bVOmQdDlp+sqaNGQ3OmnIw2YHIyfqtN8s3fRL2rGMgOgyz2cRzqAjbTYT64tDFP3qYiMB8EWgyJBxMXb+og5SOgDOmMX58/aYkcxMo07cll2ZBRsjz/gerhBDX5JTRoWsMTAG60iAG1ic6v29YE+E2EI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerin.Jacob@cavium.com; Received: from localhost.caveonetworks.com (111.93.218.67) by BY1PR0701MB1724.namprd07.prod.outlook.com (10.162.111.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 07:16:21 +0000 From: Jerin Jacob To: CC: , , , , , , Helin Zhang , Jerin Jacob Date: Tue, 17 Jan 2017 12:43:59 +0530 Message-ID: <1484637244-7548-25-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1484637244-7548-1-git-send-email-jerin.jacob@caviumnetworks.com> References: <1484212646-10338-1-git-send-email-jerin.jacob@caviumnetworks.com> <1484637244-7548-1-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: PN1PR01CA0030.INDPRD01.PROD.OUTLOOK.COM (10.164.137.37) To BY1PR0701MB1724.namprd07.prod.outlook.com (10.162.111.143) X-MS-Office365-Filtering-Correlation-Id: 62c5bbde-4cbd-4c31-a21f-08d43ea8bf00 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY1PR0701MB1724; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 3:L6DiiKV+w6dYsMOAgzbzBBgU8bZBZRPnucXKuAKhfddQiusvN203GcNzq+hqarlzMZWkNhsY93jZ8O3swhnoGMRyVsfKI+Ll2iSYhe9l/SdII6D23HNhXVTabMi5/0Z2n9v4m5sunE8T+eR98LMxFNShbiogJo4OOE717uu8Ow1DIQSZUx7ybLUwARSuE2SKuQoSsMNcMYXd6NgeAJ0AXIXGiQwMdGFcZGs4umkT4LH0CgHwzT8Zbxh/A2Rtfp9C80njTTMTdVDLq/rg+qiepw== X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 25:iDc8hhKv8zz1+5COpblLyH4lpsPwWQyxFFwNQQhm0abHQ6GgpZHoz+3zs9zSMNTBvsrreRozB5GltSyYqB8OXGeFaIkrpaJzI4R2eb2I4Opl6/YXG6xmAnBOXDMtqXgY1n0Y81YVJnV4RZwln2GtOv9exMEbev4FEmnPoja5XFymy36BzELdFTzj216leCvW2aN7rWkvBn0edgPTuPNuJecaAXOOKugV/DI6C2YC+XqzVSNNoATue8FVeJmYFAqr/kn6se+VElf7fvYBi7/rx9V0XO2gfhTX8OGU3Z5B09k6ZzMhwG6ArbuYpXtXlOsK04dfrVBF1Jqtlr7ix863H6qsvSTr4WBo4AtDG+NeGwft+I3OyCCu21Eg4wJiQWbkg2eW2U/FJPAJS9rCqSBJS5X0bQA1QeAYPXlTZa7Zpq0FBR2gUODGmMmuVoYex827pSGZlChGSpXDRzg4DwHLkSMcdZD+1vBzeBKIcGMDqAijnHbBLoZG8KGLiZHZXA/sPzbBW3panMOL9h0rHJ+LsE2ot+XEWOpNv0G/bvDcMNTgECv7bH0z1Mm+JAKVP5UCR3kn4rciQ0Xdo5gp42DKoD8X1AI46uiNX5WcGGKzJ9p1/fJEJq5vd+WrDAH0hYM2G8ObHRb8YhIualgp7+hBqyTQzx6FcCWnR3bWxwMJgKStE5QoZ9mRrHBoUpcGnwVPEm/kcol2VRYI6fzxl0STIR4PylGZIjdKcmsHljZzffUJT5ClMNZYBfLN66L9goKrMqyxoW1FAg4IuHGyqmfOcpmh3XJ5eTjKDivUEl4nIS0= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 31:Sn9EjLe2zirboKVW/TxG5ihHF74QaVHUaSGTJaCS9WJl31OC6JzmlwUXCWFm+QPJi5WIt2St2u6rDI+gWAUipJc5Snw0LEmnKfkGi5iUN9Hj6kWvG7K9bEDuAWX2ErLwXwjiu73jtdB50CZlR+V5RhxQwJShfGUHShdyb8y9aHJ8fjXYFnhtUD4bE01uV9YnL+jsI6uOcjKCDqUFX8Do8iLW0i7qTNqLPggxGUzS7P8B/2ivle0Orn1M94anohBf; 20:Uo/ubwas17Epq3xD0M/jUDcqu6PorLoQp4qK5wlz5EGprXhzYw4yVsh5Eg7TvDZCQrv2h5x9vBvsRAtkNgkfUcnqj5NX/F8EOJ24EblWkNBsJnVIAmh79AwyyiNSQ/7AFs8O5oXNQzZ2D6EUlLoc22NPbzc/hjoVIRQ2J8mlnAVsQbJPw/aV2ujv+Fkm1Crx089hLaZ5JESjrlTB7Ce1CHfhAQlC2+NU9KCqNNQiiiEesZIs/ltGVi6K+zk6y7hoEBNIn87xTO2g4/u82HO0PjtIR0hmU2uLwUeKEi75WfpA3KDWN1UMi3sm5uXc3UMfk9btpUWmKpEbfJAw9AFSncYyXHX5dWaqezJ1Dsygvj74idBGdaQwSv3VSS2IkYH0lLM5J1u4hgWsaF7wLIY+y0eywzL9axIOrdJx9MNPbim1GgizvPlN0sr8kYksU19KYmp4PhPS5LC3sNxCbDrMZ9JFk5U/N4QE14/oM0E+w91Idi0d9kqjkhF53JAGcOFHQk2nG+9/rxU44ndNz2GkbfuhPB4Iw8XIsNUenEGTBviGLUJBwIjZ8p2c+RLT0DpNMkOFDIHpEljcGFpOgVudDDC0o2FaKFvkmgW3YlJYkXQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148); SRVR:BY1PR0701MB1724; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1724; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 4:OoEDboW0HBRuGMatHcwQpgHMHdqsuXjNcxGo2Xsb1/jscLZEx6+JecasQiXiJ9cmsfuMtlSRRb/y7fy/DbvuyoWk+FanC/IGEf5LaZ2aXeiV9KC/dMRu2t+grTHXKVvxB518qmGp6CUjo7vaYK0PeM8Y7Xvd0sKAhoFmTHNhP1MxMnfZuQMPOxAZzdyQ2OUP5R7/DVaSogs/UUJU5CIztmvrRrIi1iYv5tBUo9Ulacv1ceeHBhPru95OsWTjn4aDgyc2bEejSDqqT/rSDyH9uF2kDoHUaR770e5n2pbkoh4ZyoVX24RX1wzyGniuelOaCPkr70sUYqbv6rzHNPpJwiKygUGt8u/dMhO1Aj4iFMiSScYuKAQAV+mj3YpEDwOyN1ilzG5PatPRyfF+HNmBkWNN8MJv+4XlmOMFB/Yte8PugRtIZ+1BiR9cCD4QDFF+cqhJX2t8xCccSlA3QAecTt10VXiM03t3cOXRwEcyBkwjPIlfIYOw+//ybHnlcjBwxqtR7BbOeyO06cpqah3Gn255WJbEqnYKkzPCPoLb2aPZ4driG6znxqzshvMAx7wk5LEpOIXE4GtAUgEJSt2V211/ToX92G/PMgDNh7uiZ1f7cXk5Lsi5CzxsINWf7fq2gRz6COfJH8UQnG6zm8K3FA== X-Forefront-PRVS: 01901B3451 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(199003)(189002)(2906002)(4326007)(76506005)(107886002)(53416004)(189998001)(92566002)(106356001)(38730400001)(575784001)(47776003)(25786008)(6486002)(54906002)(66066001)(6506006)(305945005)(7736002)(6512007)(5009440100003)(81156014)(3846002)(50226002)(5003940100001)(68736007)(4001430100002)(6116002)(76176999)(50986999)(2351001)(97736004)(81166006)(5660300001)(8676002)(105586002)(69596002)(42186005)(48376002)(6666003)(36756003)(33646002)(101416001)(2950100002)(6916009)(110136003)(50466002)(42882006)(30001)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1724; H:localhost.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0701MB1724; 23:jwW8FNxpIemQmlv5oGNZTyT/gUU5Bd1aC4kEwFj?= xFTVu5BLjlwg8jNttf6dljQVnFUb/uH+Ks+7JcjOGDQ5D76Z1aIfmk2/qQYVIgk4qOi+9gh7nhFYuU2SHWb6TX3weID/Fv0Y7IULsV0SMhrc94fbmxKtT5FgcSmn94NzqkhQf3qvUr8CXmrWIzkaOiCaSkKSu/KyuRqBQVy+FhatnKw+xtIjTJW8bcIDsYhjKZlm6qqE8EesXzmGEPXfFlr6+DNyAjIcXrwwfiMBASK5tQqUrhzV8OkKo7FMcDocEwNrLMqAxmG+S5YO8PLnZMTvQgzFnulPSFK0GL53lQCVs8WLevpqtzniknVqe3i6pEeq7fWpkjilR0PTfyvboNrGfKQXHGH0tcXAbWugcuaHlsxT7SJzgeAu7ChXybZcgfnFwbefCTuOkZEwnTVh/Uu4FZMMWBWWBtzB0WTKwzaaSfx8j3GoHHWfD7YwvsL3yUX2oBtSf1TU7hhIM7py2CB42TwprivJiyaxmFEUQtCmQuSBvrk+W+kwn+MJmbjXg2zQVjar1fqxykbxhv2nH0wrRrNIGfj4yVOUOcODUv/FzZ0Wc/1EWdEAVpETnYUQnNhbGgxr+P/SVeN9jZgoRZ4UPoapB0T1cvIypZoOmyvJZds2f7AEZlei7Rzs5n2aclZj4aeeQLRZAghTwvuiA6EaYX02Hia+M4PX0/HkO4etFaZHvrZx/wvUjyUXlycVZPQaCMQQmYvB1y5xbuiZhgmtBDmZC/oW4xtV9GN7GjsoV3EMX9dZa2zPZCi13QGM01RumEcvscmTug5BN23m5m9V+CPBo1NpTmUAuSmyigYtAW/83gfjgsKnE2Pg/aZTexPyTV1R2PAkBWP6wjDUUabUTD66hUTzvqZwPEL/wMeHa65nlR2B+X/UNj7ax9l43Y36Kpw0iFWcpDKWRvtwRDrI1X2ZJlTtU0AwvPGWPMNEJiz5Ge+/2slFFqPxYZXVNFUirAw9DGrSzzN6Rh8IbPMegKVKMhBz/vtjUMrR/VhUaN+LensUlkcL6OPaYnPWk5zGHrIYZOJv00h2+MEQrJeKLt1NusVcCtHTai/ic80AG/ewqHCh5poJO7zOCd4XDLVY0+7xwKvJvSj7gC8/3IL1XXcGwo7jqyv7FLaUVLvQzeA1BCJF+/gr9PpfsOwFUTPXljEjTrIVcgWnv9VXWkd/rRn1q902Z5jnoXsNIEngaJoNOhStN/TuEfVsPuOsxEf+CER6pi1tB0yjueHYIMGJyjC9ZdlVjMOyieAjLMOMcSZLEGrjfUodxzPJ1zwHikeD2NdQpS2JlDEGbyz7S5DEm X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 6:glEPF9ZgGC+EzOb8vHNHfRUhZErJ7KDgNhcz3RFdHqPOPW9y3WXIqTXVgXifWcjFR2jBp+GqMkI9lIYwnJdSyjIUYgEg/o58TItFMnNckhVMNAC2nqgcFVCLYlVAqGJaR5nHY39Jcqn6sxfxV5dcehsJpO7izvhnBlDnquBfkTxsLbHy/kgu4PM4ZudeuG97aW8hWCYRE1WMCTNg9QUI8tR3tfgZHetlHaRmHVb2Fvbc1UUnhjpEr52KsPiojG/QT8lzgq/6SfZ8ru8IBbazUQkrn7OlTvhl62WvpVpxjVx8BhCNTx9tAnAw5I6cguJ6rdx2UJ8Mgu0ertdnwrBKz8CytjdsfCI/9e7XClPcS5xUlXzFii6Hov8Pr/NhHWiLAR+4XSCsA2iUr26AWKsXr+v87W3pzuPK5Vv3YFttZ60=; 5:osDfVRdH3YFsZAvISKgyObtUWVRG8kotEcB1g5nvbnZPdkM6ZlkZC/7rIurv77P/r8sbeUs0+b7i26ZGX9u3LPD9WwhX4DOq/oiv29c1cyMn3y40TUjhD4rjMWNka2g0gogswM/jFyRYCSD6GP5AhQ==; 24:dFRnpiWLaXlWIU/CXw824PVpur3JFyk2fcrV4BhE5S4KhMxoFBk0JD743uvVgf36rfbaCGPSPMQKuhEmwUUBi2DMQkxcTVXg9HyXeDnqtGw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 7:3icj4+2TxFTVgzT9+wic/oLCsJlwkElr4+ZHoRy5NZdREBYtJKAxGMW0B6xLR4eTo6zn7R9D2KRG63y+iC829dFM1aaBxZCh3HHkhm3A/4sFy4M2uIY+kCl3uss/5zP/L7Gvdgjr3ZcpEQ1sS+Xb4/z9CppD583yqaoUj7JZZJDOQDFWD5aKVJvjrb7yeZa3i+X5aFi+MxZXiVbWm/1HjfQf08BCQrXkbFX9sl31Jqigr/yB+f1pvwvuHRCyj/F1tvkQgnOOog+GIZNPZNk3uO2emDvC85OrJLIMSjr9D1E8VlizncetiohyYwYrIXXOR/aR6g/QRGotbtFibZcWVJEXupMD8jegg+0lSQd27AW0Qse8AcHNYwWNss/V1XhulED2DdsOSvWNEkmETkDfSsL2Ltsylk5emctCVRtbnm9+EFeaQssgBONbpN/Gb6jUZ12IOvV3bC/hp+d2834sbw== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 07:16:21.4154 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1724 Subject: [dpdk-dev] [PATCH v4 24/29] net/ixgbe: use eal I/O device memory read/write API 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" From: Santosh Shukla Replace the raw I/O device memory read/write access with eal abstraction for I/O device memory read/write access to fix portability issues across different architectures. CC: Helin Zhang CC: Konstantin Ananyev Signed-off-by: Santosh Shukla Signed-off-by: Jerin Jacob --- drivers/net/ixgbe/base/ixgbe_osdep.h | 11 +++++++---- drivers/net/ixgbe/ixgbe_rxtx.c | 13 +++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h index 77f0af5..9b874b8 100644 --- a/drivers/net/ixgbe/base/ixgbe_osdep.h +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h @@ -44,6 +44,7 @@ #include #include #include +#include #include "../ixgbe_logs.h" #include "../ixgbe_bypass_defines.h" @@ -121,16 +122,18 @@ typedef int bool; #define prefetch(x) rte_prefetch0(x) -#define IXGBE_PCI_REG(reg) (*((volatile uint32_t *)(reg))) +#define IXGBE_PCI_REG(reg) rte_read32(reg) static inline uint32_t ixgbe_read_addr(volatile void* addr) { return rte_le_to_cpu_32(IXGBE_PCI_REG(addr)); } -#define IXGBE_PCI_REG_WRITE(reg, value) do { \ - IXGBE_PCI_REG((reg)) = (rte_cpu_to_le_32(value)); \ -} while(0) +#define IXGBE_PCI_REG_WRITE(reg, value) \ + rte_write32((rte_cpu_to_le_32(value)), reg) + +#define IXGBE_PCI_REG_WRITE_RELAXED(reg, value) \ + rte_write32_relaxed((rte_cpu_to_le_32(value)), reg) #define IXGBE_PCI_REG_ADDR(hw, reg) \ ((volatile uint32_t *)((char *)(hw)->hw_addr + (reg))) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 00013c6..bbf6ba4 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -326,7 +326,7 @@ tx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, /* update tail pointer */ rte_wmb(); - IXGBE_PCI_REG_WRITE(txq->tdt_reg_addr, txq->tx_tail); + IXGBE_PCI_REG_WRITE_RELAXED(txq->tdt_reg_addr, txq->tx_tail); return nb_pkts; } @@ -904,7 +904,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, PMD_TX_LOG(DEBUG, "port_id=%u queue_id=%u tx_tail=%u nb_tx=%u", (unsigned) txq->port_id, (unsigned) txq->queue_id, (unsigned) tx_id, (unsigned) nb_tx); - IXGBE_PCI_REG_WRITE(txq->tdt_reg_addr, tx_id); + IXGBE_PCI_REG_WRITE_RELAXED(txq->tdt_reg_addr, tx_id); txq->tx_tail = tx_id; return nb_tx; @@ -1639,7 +1639,8 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, /* update tail pointer */ rte_wmb(); - IXGBE_PCI_REG_WRITE(rxq->rdt_reg_addr, cur_free_trigger); + IXGBE_PCI_REG_WRITE_RELAXED(rxq->rdt_reg_addr, + cur_free_trigger); } if (rxq->rx_tail >= rxq->nb_rx_desc) @@ -2043,8 +2044,8 @@ ixgbe_recv_pkts_lro(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts, if (!ixgbe_rx_alloc_bufs(rxq, false)) { rte_wmb(); - IXGBE_PCI_REG_WRITE(rxq->rdt_reg_addr, - next_rdt); + IXGBE_PCI_REG_WRITE_RELAXED(rxq->rdt_reg_addr, + next_rdt); nb_hold -= rxq->rx_free_thresh; } else { PMD_RX_LOG(DEBUG, "RX bulk alloc failed " @@ -2215,7 +2216,7 @@ ixgbe_recv_pkts_lro(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts, rxq->port_id, rxq->queue_id, rx_id, nb_hold, nb_rx); rte_wmb(); - IXGBE_PCI_REG_WRITE(rxq->rdt_reg_addr, prev_id); + IXGBE_PCI_REG_WRITE_RELAXED(rxq->rdt_reg_addr, prev_id); nb_hold = 0; }