From patchwork Wed Jan 18 01:21:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob X-Patchwork-Id: 19683 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 85346F96E; Wed, 18 Jan 2017 02:24:12 +0100 (CET) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0056.outbound.protection.outlook.com [104.47.42.56]) by dpdk.org (Postfix) with ESMTP id AC03FFA45 for ; Wed, 18 Jan 2017 02:23:57 +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=fA98RHqiLOA6sYewIk/wXtmNjxazG/S1ppPNsdvd354=; b=RyXYFnmBrIN5vBMtA/ehBk8+45E4kCAfJL5EmRaj74HLdYkfpVjheS9QS8E9sGKHCrCifqOTrak7M87eVVyt6XLnW54LfdeX8CnRRz2L4ybz7v2bxJ8mAMcXMcjQTrByNZBRB68dczC9lIrgG6omwLxdQymH9WX/Bb7pok3JtfU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerin.Jacob@cavium.com; Received: from jerin.caveonetworks.com (111.93.218.67) by BY1PR0701MB1721.namprd07.prod.outlook.com (10.162.111.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Wed, 18 Jan 2017 01:23:52 +0000 From: Jerin Jacob To: CC: , , , , , , Harish Patil , Rasesh Mody , Jerin Jacob Date: Wed, 18 Jan 2017 06:51:39 +0530 Message-ID: <1484702502-25451-27-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1484702502-25451-1-git-send-email-jerin.jacob@caviumnetworks.com> References: <1484637244-7548-1-git-send-email-jerin.jacob@caviumnetworks.com> <1484702502-25451-1-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: MA1PR01CA0115.INDPRD01.PROD.OUTLOOK.COM (10.174.56.159) To BY1PR0701MB1721.namprd07.prod.outlook.com (10.162.111.140) X-MS-Office365-Filtering-Correlation-Id: 49067a4f-a1d4-48f4-a213-08d43f40abfd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY1PR0701MB1721; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 3:a9qKNIk5Rt94m6boF5UdUPReDDCfBygZlDbxp2vsAYGsFGu6zxC4Lqd81sj1vA6zUwA9yY9T3zBuSsbSTzREQwjMF+Lsd3z3JigKOjJ0ri0FnYo36g13tbMmgdQZAv69i9sEIoXCE9TQuz3ldQL2ClppJ+4CoRkN+bGxrY86euqygX1vYJVDeKNLJu7WxSgRc+6ME97k7MAbgCBLp7g48+4X3cxnfWGmId0YBi9/c8ch8oMIn1HgVkr/+s+mrrarGgOAndSbUjjhlArdSiM8Bw== X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 25:FSE70koKEUwe+j4P1H4+BLUdBUOvsBVFpbfbJXhgeaRrDEmhDbfNmTLXs0oBOklDZ0UIcaYkSHche2S+SDW2FhVkufv2z6CdH2W4NGiSQCzcohO7MYfsbzcnjdE4KNs7ym3wO6wbvEXzA2+3yQ3wvU1mJ13rxa8x7WASymingB/vHkF7v5RBmfhjJmtX7O42D3hJ18CDJ0kcorT6RvI7Lo0+nC/6EVRTo/cFi40e3Rgeb2p6nbUOGzEVhuKsyCBP3XIzO0fXRC35wJYDgFpgEhThSihJfab821Rla9TBCWOjzYcXtnHf8p2j/58VlNfj8hJg9fw1GvnB5ui93hzzVA2fA0zdY2AKOcTG7oDUg4TSOagWUaSknyKRnQC05TL+dw88ePhkRNbcnnFcN0i1+2eiOmMJBQRKgTjv/P+qKIcJBD3Jluv/pXXuPC9Ndffa0R+74Hah9/vlghw//fyL/u9s6rAVJxLtW9Qp8/v/scNGCxEXGYdopHnMoZkop3+y+LXw112m6FshgVyOcKq3zQvgwm12tklcy8tNkPoFWZ+TXMlOKqXBanfMW50n/gyo+ATdyoli2AFmdlTsXXSRXdCldv7Eg1nH35H3wuP3Fs9pcV4KmShpMdfPyFNBcOyuNXcbMKuilfJoro0FarQT+FDPT9qjJVLUVQGpRTIRMEpRdhgQW47TSIHHEciCZcTiwy25bmzyefC2XhZvS1PYHxmqDbk/ztTtc9ny7LNojOQx1Sa6iP29VkWoBx/e39jJ64bYyxEVgox+PTkl9fpjuz2HvW9qj3WKWeNHtqrXsA8= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 31:xQyP4IAS9oq2E7Dxklm0HscpvQrbhn4i7SStbeU8HiRncsx/izAQUbvDTBabkanxh4YEmI7EKqJx6eueVBuuXHUUidqG5aSGNtjCiG8GTil9inizLbDE6XocF6w8d5dziAhS2wvHq/QNwIUhY/r63MBq6/Bg0VkI4vECnD0aUUTzh1JR/Kz3R9tmjDQn43UgkwSB/93bb38hkvODSLqkClhN/bxlBqNRC/Y9w+n20s/QYMO0/GpDg+/U5VyO3vIPaZx9sBSGpWL1Xplkk+nT8Q==; 20:C1hb7vWsukwL5kyGxrdqeXPt3PRo8YJ2XJct64QH+4SPJBQFlzQQV7zZoseVHA+4Sri/9rPYlyPH1wmG8LzUXrnHtwxc0d10uUIgz390Vw7FC4d8uQQec0oIUByJdlUbSvVxqvRYYD9zVdrqMO7UfmFDwNER0D1emQNYTP9GaZyvyjm4WT2ZjjzH5nKglshf6abFyV33a3HMhdMsvnMtEMcgRd6WtIdNVOsXiS5bWcEx3vbI0726TjTD7/5WEaTUYfUTGYwgsXLRmfpyK18OYVShBF8H4aURRWs0CnXBdgNGexXiZwcvGUnhcVTh0K314LIIJDI2Lf6JgZPX5DdZkmueBihH7jWpwd6lOkydK4P0/v8tB8mhqgT7iGAsTRVrrfXgL1XIvCky5GNuHx9NuFXHdBbPQnZVhzvZ+MZxmJwmmF4mvwFAyDhd9y85Z2Ko787t6WPbyEqkG3sq6KGsMjgPf6ewlyHXN9Jlin6Dt7CfYQTeEwrwsj9ZMDg4m7StclWrnoWeBAROjM+JIqwlp30dE+9TLrbUWQB1nUOryrvYfR/HHd+0v7uJ0dnZ7P798RQVHC2rMkEOu+L93q55uXpHtuZfwBQ3E00egkm2cRg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123560025)(20161123564025)(20161123555025)(20161123562025)(6072148)(6042181); SRVR:BY1PR0701MB1721; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1721; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 4:/MOS6J1QR41zcSFwgrBMmLV+robKAQ/XeyG78s1fOq8aKqco1ynvrkcDSd0NKabvpYKgPgrHkT3G7vHVdKuKMNUm9hTMKyZUaZIEo2sUi0EOm6EQflQDqxTKHLEvDJN+tmDkQX4g8SXti/TsXWSuSKSyjaQCKmOEsNFbFAq1PW5rrd9rIBtoaj8s5zFLdIZWqm79MVq93xQqYpiZssKtx82BYYsY1f47xK+Co3eWFH8W/f2ew48yThXgOvMj0clRucRGQpeB0tYWWV0mH3TTOqXNICJoGuu+u6e8xapj0njhlS9HlCem4nOjVQi4lUBSc9sdB+Rmh16njyqKod8ZRevxFntwTDQHtT6y+gIeFRSj7HQKGAzsg3Myv8sJHUiavZTyipbUp9jGABYC8nGFS7J/9w4oFSwgWj8VuyzRq7PGddYSdDyACrS8Q5b8uGVkdjofyYERNxWLNacOr8aFA37DuBHE7cwGX1dzUEb7V8EAmwN6NvhYJ7NdUAZGqERVW21GBiYZsaqgCzUY0ToX0bg/ce3H+Pi/KGA4yyecJmOcFod0qNSbwXemiqPCckulUC1/E3Pyy42E9mfQOWoHrnAvFPYPLAmZAGtpooRYFm8Jvhy0uP5gQlj3AXEiSaky X-Forefront-PRVS: 01917B1794 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(199003)(189002)(4326007)(6506006)(50986999)(97736004)(47776003)(107886002)(25786008)(189998001)(54906002)(66066001)(92566002)(101416001)(38730400001)(81156014)(81166006)(6486002)(2906002)(42186005)(53936002)(50226002)(8676002)(2351001)(68736007)(305945005)(53416004)(3846002)(50466002)(6666003)(105586002)(33646002)(6116002)(4001430100002)(5660300001)(575784001)(6512007)(48376002)(69596002)(76176999)(42882006)(5003940100001)(5009440100003)(36756003)(7736002)(110136003)(6916009)(106356001)(2950100002)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1721; H:jerin.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; BY1PR0701MB1721; 23:goHAqTOuDaGmfymsMavFoI75iONWxC/suJHG1yl?= pAYlTN2RSiBbNsJofU/yaxR2F73kL2xqufKTzSaUWS7WEaR0n9qXflaSY8QKJ9RsfUbIETMB1J8KbAntYU+TIoeOl0sgiG8QxVOXcSipIBnbdik2f0b7kvAcSq2o0St/Efq4eisUBeIGBhdPbUVvoTnxQuMCdioYbs8pIXlcMo/2JgqoMpsrY6xCWGr+ZGwEKIUgKHjFD2bSstQoi0Rpr0izWOPcU0fZtDMFH1rntI+l/a4wXTt6ENSAG/9NlW+h2zLauCGtj3eTWV0hJr5QGYbkfmKnxxyABe6Dtgh9gKhgOZeluZlVRATkS2CjPJcvk2acTrxvtdhbnySKThOReATo6M/eFEf12nD3gK8Lsgk8NjPJF75zWavMyvevnx3bmQxXQ1MbhUDRy7COcSQ0/QBOwINPby/Dv2DBCNtoTZqjIw3pYde56UKfzKYQ3GO6zv2xUV8aGzJbQE9UJn9RWNq0C+ANz+nTkVK+a/3QWtDGW5KZRFgtcgn6rGt2Kuc6xvHrz/7fo/8a2Vl/L+1JZHFBxeIFepcItNI5ddEMQEMjely+LcF+aetyw55yRLC8SQlNrIf/PWDxB28eW/o9pIKOO6ymGKQHseydZbHywx7Hr4vv2wCGZxM7trVve+pElP6Fl2GvYhNuTxQOBtFuvmoa9tBJ4A7cezld5daJGVjtuDCWGeBPt+a4jKFmu05+uVS1QyepfEia94PrZOLuuFIp8ukbF7Ert18ljT2QvuYTMkV2iRa27+CyM0hQcUIIPxNQQ0OS66vcEJ6NSlKBEdMm/Pa7RB4zfDbHb5vQAHoFFOkcihDT5RCCN8+pFTIUoTrQgp9HXhr4wR+7LH+lKDyBHIZRoYyePi2OBZf1HWUr+hmz8gg/TTcR6FE8CNFfh0JEOH2VLu2jVF0mdjU9DD3jOOLKdPf5w9u+CFZzYMdy7Nl+Z05DBFNt/WjJ66l4iye+SJ5iElAkJCGmfTsmDbctB9SDkI4Sn44yJ0fks1NT/6UfNd5VBjX83h7jh7IHKnDzVeDHewAROnlyv6SNv5qs+AUezsE7exUBa6wwWZBb0Vjm5B4upWMB1GELR2Wk0cxS3dz8jjZ1A48JcIYgXhckQZqUwTvqrxOh19Kr9nqISWQvrY2PquSfIi40F1UOfMzyoLZ+r1KzMM3fDDpjKaF9NY5yW4kGXp3mOVvRhZO3DJL6lENNp2lstfYeOJxzXuaawNQQMDpIM8tlkYURUxoaiCHB2GyqWwfrXiQoHGlWoFw== X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 6:UT7tKSQCqPCmCsQrAF0Ty92zF1JY0B6dCSvyeOkijBU2ZnXHFFAaCzpLgCZvkaAvMlbLcQ3CN13Ferqi2F2Q9WVX+9UHo7D6TS4jp5o2a75SI9eQ0/dEDJVu2XLAFu7QdV8V20UlaTO7E2NP11eubkFukKLrwVYc6C7gDcace40ESLl0bBrWLFe88MSTGJbHl+F31wKN55NOZtx2qdFdCFMcSXVDmXlGqYwCNWTCJ/0K0kD61iShCuE9av4CZYdibLnjrgRwgdZZ8gGpSNg+YASt6QLX/iAlpYyz7HiCios97I5HpLa/epRIgOT9/mHCrJwYgjOefhBd/y7eIw/xXfxa5L/bGScp+dh1Qcha+AV7Fx9VfvnRNPXOyMhNF44guDbhpjxsIhrG0A/lx4/14GVSzqMyNxHFz+RrhpLY++o=; 5:nwjtzQONADnxi4Moic52e5JvnomaUI9Cvk5rPbQ38yhsZYhRyFSM9ZuAC4/FvLlLiXCXhm36uPUME3KECeycIY9CYFGH9XXCyanzJE/+dV8WYKE4EludguXFzHdqMnDSp0sPu0HGe0QZ59g4WhNe1cPHRhLykCzSHnpmpbwXb/M=; 24:JFMYCAl3zRYio21k1LpqAqhw+zPueLYjKbhKltQ0TjxLLbwe3WpJ1gtKL5vchkciRXpid/O3bskjkqe3r6ulHunPxVkW6Q8l3PRIxf276H0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 7:XRNjA2iGFfCVQjBWtnGHQ3Amh/pW9FOFIxpOtO6//+eY8lzg6zQLOysUHZO70in9ZDmWlmd14HqLVY0FAuGcUs3r6gLs/kDthCDFsI4MpCDdheRbloAJLk9b0hyW7dL7QJKRoeaKjVmLxQSByoSZh9Hikw9CE9eOgrs8k9SzZuETEq9uk9ScmbvUOMkCDcGu2PWvbIfCfEVBMGKyryMG2oxDmCBll6FkUZji+AukHJUkySP11IalkiF+HYZ2hIM91oBBULQDuBEs8QsSwwbF9UronLtf0Vt3JT9qQU95UKKrAznKIAjADxaFnqozy+DC/i0uWa31677O8DWqth8PaQ+z3ChEBLTa8W+jsmVnlTHl26tLnSZSw8Mcz/+P2ulcnqbTCeOOGhysmgiOX0sU+uEWpsxTvz7rfv/n8xB97+TNgHT+6opS4vGDKbseT0PD/Cbafv/iuCnPzh6Xj7h/ZA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2017 01:23:52.9288 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1721 Subject: [dpdk-dev] [PATCH v5 26/29] net/qede: 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: Harish Patil CC: Rasesh Mody Signed-off-by: Santosh Shukla Signed-off-by: Jerin Jacob --- drivers/net/qede/base/bcm_osal.h | 20 +++++++++++--------- drivers/net/qede/base/ecore_int_api.h | 28 +++++++++++++++++++++++----- drivers/net/qede/base/ecore_spq.c | 3 ++- drivers/net/qede/qede_rxtx.c | 2 +- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h index 0b446f2..33d43c6 100644 --- a/drivers/net/qede/base/bcm_osal.h +++ b/drivers/net/qede/base/bcm_osal.h @@ -18,6 +18,7 @@ #include #include #include +#include /* Forward declaration */ struct ecore_dev; @@ -113,18 +114,18 @@ void *osal_dma_alloc_coherent_aligned(struct ecore_dev *, dma_addr_t *, /* HW reads/writes */ -#define DIRECT_REG_RD(_dev, _reg_addr) \ - (*((volatile u32 *) (_reg_addr))) +#define DIRECT_REG_RD(_dev, _reg_addr) rte_read32(_reg_addr) #define REG_RD(_p_hwfn, _reg_offset) \ DIRECT_REG_RD(_p_hwfn, \ ((u8 *)(uintptr_t)(_p_hwfn->regview) + (_reg_offset))) -#define DIRECT_REG_WR16(_reg_addr, _val) \ - (*((volatile u16 *)(_reg_addr)) = _val) +#define DIRECT_REG_WR16(_reg_addr, _val) rte_write16((_val), (_reg_addr)) -#define DIRECT_REG_WR(_dev, _reg_addr, _val) \ - (*((volatile u32 *)(_reg_addr)) = _val) +#define DIRECT_REG_WR(_dev, _reg_addr, _val) rte_write32((_val), (_reg_addr)) + +#define DIRECT_REG_WR_RELAXED(_dev, _reg_addr, _val) \ + rte_write32_relaxed((_val), (_reg_addr)) #define REG_WR(_p_hwfn, _reg_offset, _val) \ DIRECT_REG_WR(NULL, \ @@ -134,9 +135,10 @@ void *osal_dma_alloc_coherent_aligned(struct ecore_dev *, dma_addr_t *, DIRECT_REG_WR16(((u8 *)(uintptr_t)(_p_hwfn->regview) + \ (_reg_offset)), (u16)_val) -#define DOORBELL(_p_hwfn, _db_addr, _val) \ - DIRECT_REG_WR(_p_hwfn, \ - ((u8 *)(uintptr_t)(_p_hwfn->doorbells) + (_db_addr)), (u32)_val) +#define DOORBELL(_p_hwfn, _db_addr, _val) \ + DIRECT_REG_WR_RELAXED((_p_hwfn), \ + ((u8 *)(uintptr_t)(_p_hwfn->doorbells) + \ + (_db_addr)), (u32)_val) /* Mutexes */ diff --git a/drivers/net/qede/base/ecore_int_api.h b/drivers/net/qede/base/ecore_int_api.h index fc873e7..a0d6a43 100644 --- a/drivers/net/qede/base/ecore_int_api.h +++ b/drivers/net/qede/base/ecore_int_api.h @@ -120,19 +120,37 @@ static OSAL_INLINE void __internal_ram_wr(void *p_hwfn, } #ifdef ECORE_CONFIG_DIRECT_HWFN +static OSAL_INLINE void __internal_ram_wr_relaxed(struct ecore_hwfn *p_hwfn, + void OSAL_IOMEM * addr, + int size, u32 *data) +#else +static OSAL_INLINE void __internal_ram_wr_relaxed(void *p_hwfn, + void OSAL_IOMEM * addr, + int size, u32 *data) +#endif +{ + unsigned int i; + + for (i = 0; i < size / sizeof(*data); i++) + DIRECT_REG_WR_RELAXED(p_hwfn, &((u32 OSAL_IOMEM *)addr)[i], + data[i]); +} + +#ifdef ECORE_CONFIG_DIRECT_HWFN static OSAL_INLINE void internal_ram_wr(struct ecore_hwfn *p_hwfn, - void OSAL_IOMEM *addr, - int size, u32 *data) + void OSAL_IOMEM * addr, + int size, u32 *data) { - __internal_ram_wr(p_hwfn, addr, size, data); + __internal_ram_wr_relaxed(p_hwfn, addr, size, data); } #else static OSAL_INLINE void internal_ram_wr(void OSAL_IOMEM *addr, - int size, u32 *data) + int size, u32 *data) { - __internal_ram_wr(OSAL_NULL, addr, size, data); + __internal_ram_wr_relaxed(OSAL_NULL, addr, size, data); } #endif + #endif struct ecore_hwfn; diff --git a/drivers/net/qede/base/ecore_spq.c b/drivers/net/qede/base/ecore_spq.c index 0d744dd..6e5ce5d 100644 --- a/drivers/net/qede/base/ecore_spq.c +++ b/drivers/net/qede/base/ecore_spq.c @@ -248,7 +248,8 @@ static enum _ecore_status_t ecore_spq_hw_post(struct ecore_hwfn *p_hwfn, /* make sure the SPQE is updated before the doorbell */ OSAL_WMB(p_hwfn->p_dev); - DOORBELL(p_hwfn, DB_ADDR(p_spq->cid, DQ_DEMS_LEGACY), *(u32 *)&db); + DOORBELL(p_hwfn, DB_ADDR(p_spq->cid, DQ_DEMS_LEGACY), + *(u32 *)&db); /* make sure doorbell is rang */ OSAL_WMB(p_hwfn->p_dev); diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 2e181c8..e1e9956 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -1246,7 +1246,7 @@ qede_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) txq->tx_db.data.bd_prod = bd_prod; rte_wmb(); rte_compiler_barrier(); - DIRECT_REG_WR(edev, txq->doorbell_addr, txq->tx_db.raw); + DIRECT_REG_WR_RELAXED(edev, txq->doorbell_addr, txq->tx_db.raw); rte_wmb(); /* Check again for Tx completions */