From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751208AbdALTIt (ORCPT ); Thu, 12 Jan 2017 14:08:49 -0500 Received: from mail-co1nam03on0062.outbound.protection.outlook.com ([104.47.40.62]:43072 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750922AbdALTIK (ORCPT ); Thu, 12 Jan 2017 14:08:10 -0500 Authentication-Results: spf=pass (sender IP is 63.163.107.225) smtp.mailfrom=sandisk.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=sandisk.com; X-AuditID: 0ac94371-7ee9b9800001058c-cc-5877d1f55512 From: Bart Van Assche To: Doug Ledford CC: , , "Greg Kroah-Hartman" , Bart Van Assche Subject: [PATCH v2 15/26] IB/mlx5: Inline ib_dma_map_*() functions Date: Thu, 12 Jan 2017 11:07:07 -0800 Message-ID: <20170112190718.6728-16-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170112190718.6728-1-bart.vanassche@sandisk.com> References: <20170112190718.6728-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsXCddJ5ke7Xi+URBpOPCVu8PP+B1aJ58Xo2 i8u75rBZPDvUy+LA4rF/7hp2j/f7rrJ5fN4kF8AcxWWTkpqTWZZapG+XwJWx/tYrloIz3BUP miawNDBe5uxi5OSQEDCROHfkMXsXIxeHkMBSJonr6y6zgCSEBLYxSpx9kgJTNONuLwtE0UZG iSWH3oMVsQkYSXx7PxPMFhFQk9j0ahHYJGaBxYwS7aeXMYMkhAWcJN51n2IFsVkEVCXWnzsI FucVsJd4v34tG8QGeYldbRfBajiB4t/+X2KEuMJOYteB/2CbJQS+sUh0znnNBtEsKHFy5hOw zcwCEhIHX7xghmhQlzi5ZD7TBEahWUjKZiEpW8DItIpRLDczpzg3PbXA0ESvODEvJbM4Wy85 P3cTIySkC3cwvr7tfYhRgINRiYd3h01ZhBBrYllxZe4hRgkOZiUR3lnnyyOEeFMSK6tSi/Lj i0pzUosPMUpzsCiJ816M/hgmJJCeWJKanZpakFoEk2Xi4JRqYMw3FLedPq/yEmPavsiVgb4n ntj4Tbj1iGVz7vspGnUT2mMrey7stbKu/n2IKzSoXeSi4bHEv7fvflp+mL3iWJMXt8DDz9m3 tqismp7L42O1NrtistSzi1cv3a0ytLhgeGtJ6e3bUuIuK4+WKkT177JgCL6Sd977U7Sow/7N U0LnzD2a+MzJVE6JpTgj0VCLuag4EQAn5PjsZQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAJMWRmVeSWpSXmKPExsXCtZGTTZfvSnmEwYYpJhYHf7YxWrw8/4HV onnxejaLy7vmsFk8O9TL4sDqsX/uGnaP9/uusnlMW3OeyePzJrkAligum5TUnMyy1CJ9uwSu jPW3XrEUnOGueNA0gaWB8TJnFyMnh4SAicSMu70sILaQwHpGiV83TUFsNgEjiW/vZ4LFRQTU JDa9WsQOYjMLLGSUmPhLCsQWFnCSeNd9ihXEZhFQlVh/7iAziM0rYC9x6ucGJoj58hK72i6C 1XACxb/9v8QIsctOYteB/ywTGLkXMDKsYhTLzcwpzk3PLDA00itOzEvJLM7WS87P3cQICYOo HYzXJ5ofYmTi4JRqYDRlcwvLYvm5p8mO5dG08n37jG98fXK2aAlrgMT7+DOrp2oK9TKsru23 +53nZsGzMzY/6q392qAwfWX7LzH6sx90cjYa35w0eZ2zRo5UqPsX9o7bcaenSEpOcihc+az9 rOLmOZEzVO928tTen2L1Z/Lfvid7WhXZ1YuePlRNSrl9O1RmwscHtUosxRmJhlrMRcWJADAN 7LOzAQAA MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:63.163.107.225;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(39860400002)(39840400002)(39450400003)(39410400002)(39850400002)(2980300002)(438002)(199003)(189002)(8936002)(50986999)(1076002)(47776003)(8676002)(36756003)(76176999)(92566002)(33646002)(54906002)(2906002)(106466001)(107886002)(189998001)(68736007)(81166006)(81156014)(97736004)(626004)(48376002)(6916009)(110136003)(2270400002)(6666003)(2950100002)(50466002)(5660300001)(69596002)(4326007)(77096006)(86362001)(356003)(38730400001)(4001430100002)(50226002)(5003940100001)(305945005)(50929005);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR02MB1418;H:milsmgep14.sandisk.com;FPR:;SPF:Pass;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD023;1:gZM/MB6iGAnJwAW3140l+BIRkcXt0c2Y1TfnPQUEOLwyNpM54DOgTD48RDXbzviQzs3gUNaPQy0JZ3Q5RRqTrW2sB/KLoPJSprn6zSsN0rRzttCwtzNbENWWQNLn2oA5yN2vI4wb8oTvMeh8TJJ+Tteqk7J2sQIg/nLI3LNx3KZZn/mQgfZLbdeY+kwarw0dHZby3+TAtrgJI9CCbHkR9Dj0Bl/saL5r1itRAHJrHeqHnp/LHV3MN2Aq2+/67Cc6sve6RhOkzcJqFmGTPoR8a/zk5BhZ9xdzl/18GZozftm5zIztSToFGmL/rFXAhZO6i7XAnYjQKX3IQNOzamkL6rDYHoyAVdaYMLZiiglqy7F9iG5mQxbv/dshcnBiKHmympYWbMEEux0CIfosT9twIBz6rVk1oaQdBtUWfHzcu+Peo0aPIFfx0dEbpO6G1/Lf4eWpINp12xE2C3z5Yzucgf2EF7sR/iWVWndE2eA4w+wmNG52Xw4PtcyE0ye/n0nG X-MS-Office365-Filtering-Correlation-Id: e5ab14d9-75ad-4eab-2ecf-08d43b1e56f4 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(8251501002);SRVR:DM2PR02MB1418; X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1418;3:6lDWnDKRZTtyLc85i/Ak0fkVHg9EuyJBHYujcc+4EsHw2qvOOPDkThMrDqsvNQJ7zTl4MhkzWpMdtKoCNlVZKzltxFmCoWhWk5JYCvpK9Q/Lh8kQTfcu9MrjtRwMSQxq06qj1w5Cmege8OCk8ygSw66mGtv40nv4A8tIV4yn7sFwWGhvCZ7wlSuZIBKJ6gnc9CxYBANxe77X7mTy7quHY3w4Qoz/gcO15ju68CmgIfN4S6Myy3oalNaL2U4K0ZJCdvP87kpx1PDKbmtUAx8ZjLMUjhCjdinKDNdXCak5o1OjQ1h2CZjl3nvYY8JfjzozHM3NO+tnBZ9bB/QnMBUIb9Ds2NWjLnAN7HEPklNry5E1kuWXqGhNewCoKeu79o4IZrWG6t3gL9Ls2utjfTfcvQ== X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1418;25:zA6QLUQ8HmJPORT0n+nvjncfFrEWOAWfCk30KPBF2TxdaBJUWAcnRgSe4ri1JYilnbi03nFPhhO0mxm2DPnGE+t92lTIH2BDvIoC7wlyhLHAnXxYUUweqjx5IxAnT7f1CqYtp+uw+xsL0V+HkX/G9yE24GMEP4Pht6bRToU/10kxfjlF+82UM/BlJ3oPQRB8E0mk3TPOQyqKwxyX++txHVI4Sl0MezGdI/p4P0r1VcvMPa0ToLm5P7+WoUWKkVSkOUAxC51+HX3U0ShO67hwg/ivSWwS3ChIRnRMgGaoxTcepVssxUwyydHj4S25WNXCF+7XFRfhZEG+oYnIoJLQjFD463ppxEPp3t74ZzqjShVcYylXiw4aIIvuRJh/xsJvNp/DHy2uzKNT4zIhHPGmbwss5i+w0RwGBM8RcyxGFK2Pbbe6WjTlNjvlSej083pjpWXo3UbW57DBGdu60K952y/L0p5SkrgiUgh9HwlsWaVAHMtAatzkUJT7FXKrPthPSJ6C9RST9t4uC/dNQgMucw7SiP7zJWlNmuwUZPZ0aW16IAo18D2ErG4azJ68kufURQAzbtiwFuiMISwCAXfL/4DtC3z8pvIi1g/o3ggjQAC/WUcbBzDTvBPCWHCC9S2SFV5yacPo7bslyaRUVm6BTJS9jPiPMaicIj02Q5pgfog/XCPiEoTP2Q+A/zm2TTqvZXcRuYAixPTxd/LyXrDO8NjQaYrl8grtIutult+1pJHwKswTwQFYT7C4zOpQp7iRRdLqkg5/5LquaZ8cCX5vDzhcUVUAOYWZYqSZS92UVvcyugn5fmpMSsJqNvmfmlOq X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1418;31:LZOej/Le4AVixC9C28svfUduofr3kcQZVrkoMm0oH4CzZkCVd1teZ303SexjS20dKRc5ez1sNbJ7RItxYCLZ1jQZlJuYeqazJaZ3KVg4c0hUe9ggOLxsnX36lMfQ5FSnImqggPv4C19uCKjjPatEZKpbuV4fLnW6UXLuuO/AYyKTPKz+p8DacoGImqeL1fOVHKZNJqzFvtNdbWxPK4kDrj7SufXugBRyNcjMPkXyH1b4ktaRzYtZa/iszD/LjCP2hpnoNwahoKNSH+Zou8OXNfh1+tvm3OiuraVGmdgGon8=;20:SNmCQmfsujrbsvAQuBw4hC2kM4nHU//yYZqItB3cFyZ9B5NiBiFaWGMbZXwoJtnZ6dB9D7fyCLc//f0KMvuxm6xKkraSBTMXabUbl45Fiyh0fftsM2gSE6lSwM/JLlfK6DuKt7NirrOs1oTJYcM5twuGNDHI/OULhOi6Ix576fIWaHv3EMQ6UQ5h15ebOjKypb3Lv9W9PJQeDjVFEYBsNj+gzkzkB99tmBQ0ryZDbkPHBIos1PLnbdtpmdUjPhbmspfOvprBI/kHGWFlJFcmfGqpGdeiuwOevRvIXb86s3d9Yg4mfUIMgHJDDg7mAuwFzcBmvv9SzXXk579+kCo3TI2dfSdNDZbt6TKBMITxh6KZtX8WqGqXt2LW9sirCjuJL0yU2lbm+jmZb0namckb6MiQdLZ7b+xXh/r4AyCP8lV4LWuZ+peE8DzczDtahDQ2vr+vh/eochX9I9HdNl8Fu+mM4Js6qAIHO7pTIetMfG5armTccatb0IPLsRx21Q4m X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569)(235219596079481); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(13016025)(13018025)(10201501046)(3002001)(6055026)(2002001)(6041248)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148);SRVR:DM2PR02MB1418;BCL:0;PCL:0;RULEID:;SRVR:DM2PR02MB1418; X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1418;4:jDpl3FwYeuGa6EzIjrlX//bOedt25Lttpc2ulyvB5QZq/fFYvfHvX5mHtZl+Q66Iu6XxTMqTtEvM00IGLRVglnlUuYSoknZgpv0FtUunvwim1NJ6fSazzRZZs4YM8KPwMxQLBb6xRlD0CZE2Fw5vki8tXk9wDFpzAWPnwy+2idRdJSof+jONLr2GlZVCLdIXZtTzM85lnS6QF4GcJpHHQukbpfQDydK9PISq9hxDua+F1z4EmMRzI3lBDckjmxf15SJ0IkdEh41o45FC9RnpeTxCYx6DV8VsyC9qOQylenT5vrgVbMjPV9I3rKocnhOs/+7WzcOzQTEkV0CCbRCWND/W/GYVAiwToOjiBNEw1pxZT0wr/vYf4rjMkhvQNvFOuP0mNanEmVg8LHWoJ6zYQZnWkyb0OBx9x+TgAYU+ld2J2fsEwpMXznX9NohKe3bEO3M9wOL1rTkBXVbnwZ7LEf/zmFMuSZ/phkSmrPsY1YBVpOz+Vxzn/BoF2eSX+cGmVGRnDg0reBm8thrnAaDorWgqq0l0UmKGLrJjT2TzB9aJCWxb/wTD1l0TXWSIFy4E1qoeC97MqTdJtt8WTsjpUOEjUQ2+u+dCgW1HRrJ/5ZPOO/qAzQSekC1DBKyvFzq2jpDAwl2Yzb1rju/aIdbMtpYj+yEMWxSg7BmP3D/wPbTt7bQyVfO7Uzju8TXBsmkvscaAdeHvPlZgXdCC/tIIM0nGww/OkGXPZP+QcYYNh78= X-Forefront-PRVS: 018577E36E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR02MB1418;23:05/2+WzEf9ia+MVLXUaGSxurtiy/g2CQMDuGJnJ+h?= =?us-ascii?Q?UD88cAvOkGQL1rpcDRFiH9g6Pao0wqEhjca7Tc6os2w3uoabfnjQnLVLKSuA?= =?us-ascii?Q?aZrWzeJ7V6j4LEopZvHAXCo2YPD5CTuhy0j9StM0KovjqFO/6Z1tp79A7Xo6?= =?us-ascii?Q?QoJ/PvVBEa3ojfclwJbavBjIYadOvp+tDZw59mIAbjm1O2ugQTnKVnNczowr?= =?us-ascii?Q?5tdwR/KjurmCeq4LRQc1Kw+YbBHyQIbwvnQLoCJjlvZaAQiNv7VOvn8040mm?= =?us-ascii?Q?hvoWmx7GDWhQA0JqoGeyyksCbCogiZsAG9qgoNqueuVbyYFDFmUSY8SI+96Z?= =?us-ascii?Q?XHxn2joTy9hN3iDeNsKBx65UUlG2+EJxyRbUog7pxP+GZEeD5gBCkVi8ppl2?= =?us-ascii?Q?NDqDXAlWrJ8o/zlt9ydnh5ICtFklUXfLGM9lAK1hz57n6OOm4BJEZrqjdIAj?= =?us-ascii?Q?hU/LTeUXUrJSK0ma7Yasb3nJE9KF2Md4TpuhLkufcleLRpyoYuYcbezvS9kt?= =?us-ascii?Q?XB7vS5dWV3MQFWUVFUXlk7ShuRSMsabTMtO9Gt+nqszS5uXCg+WorEuYya4X?= =?us-ascii?Q?fDXTvFY4FirOKAup026Phi2pnhqBG0dTn/lSSzQ8vHBJs+hE76FlaxFvzDtO?= =?us-ascii?Q?P3113neqpzqD6BnovoVkDuHYF7VYeutz1vkhCJhcxjXhtycaKUnH9JKarApF?= =?us-ascii?Q?ZpYhAI7MLOXKV3kUyE5QlaCqOoH3zdxQ6LaNECQeMmUGTXQztgb4LcjIXL2X?= =?us-ascii?Q?9l74M8NBdRhfSV7uCCGjeCw+sb4wYHztbW8yYCHDr1WXH2BA41y1IS+Pl+H2?= =?us-ascii?Q?9PXhrf5r0CXggy/SDnSpdGNaQhwRRMWUMoo18p80SrmQp6H6qT0EWQSl4JD+?= =?us-ascii?Q?wfp/HSRhuh8iL+spvL70hd7hTQFyFYnj+H22N4NxMsI9zBoKQfTKzkbUucvR?= =?us-ascii?Q?AMKiUp2m/gcrtLcSXRz3eoCMhM+Gbo/fzmGT8FIJeLY/K81PBzAQsiKgy3FA?= =?us-ascii?Q?t8KFB/7SsU72jRJOT0MV8xps85XfRGOUhpgn+yfl24zZ95hqRXkNTvk8uA1i?= =?us-ascii?Q?s4+x/vyF/mp1/P4/w5uMNrxx2znQQJM6D8Pz6nTAP2zpQK7/ywsEKmGeq/ih?= =?us-ascii?Q?txYOiOUCxiYPS8DsbTDJb1u2NflSE6B6OXeczoGfuvMH/wsMUpr1mPdZLhhc?= =?us-ascii?Q?xqMQMp3TbeZKvErQfT9+sEqYk7F48pAXKoR?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1418;6:tK9d7Ul/h264dsTXbcfQjM8iM2w/wFz/H3F7TnemCBNNXKIouXpUWh6AktaUbtlW+cpGiWx54wFc4rqwhkeih3BH7P14KUkbpyV5Ec4e2+t1bxe1OwkDAuzOCRmWQ+CKKba2c/Z0HvQN9xgAN5+83Kt7SRg1oBnmJlWQqPrEs4DAs2JlV1f7PSMdO/YsKTDp5ODDG+GaXysfGRoLQVwTYSWGCA7ey8mZzqS+QNq9mfy4rre/ATnLyczDuOWyMG1mbycNQ1d7kl99kgYgiZDZ+B7XBW5KuI3j1BQKMdJXDll+wFIo3G9QknoRyyyF36PWyYWFcz4A/uhiFRm/VnW+WvdV3FJaqedWBH+PzRtCV16r6a6POKK3cMQLc75XcgPYrcxb3OyhcFRd2NUI6Fzao2c935flhMIkUnlYv7Fgu0/lvnmleYvoL0Dl+fpv0XMRjCKrW4EMeguN1NbFuIy75Q==;5:/Z84Au2YPbYOrr7gim9X6ADXxSIayOdKnA0a0KgEBKGaexoBBCA73rfJ8emILU1Z9DBgsDTMLiUcDlvw24axHQOA0C/RGw1cApEo1y+lQLIDOowiaJcPt5GbRSiHRPgGlPzKfSPXMlfKu0EuBkNwEQ==;24:Z7I372KEiNYysEjbJVQ3wSFM0F2MOCoyJVTG7eiinRJJ0Em/vV+KRKf65ndcjK0HvuZBrBFnK80HQNpcPczIg8JPiDmrTkRWrjDmRnxgOi4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM2PR02MB1418;7:VLOq5dqyoyCS1truOwMzT2cAbRvU67OIrhvSWc5UgVpUCF6XmhFe9LPr0lwx13aSy1ckCp9PPJgwd/gXT3nM6G2jhyIzqr98LCRkLTqyQvuoDFfpwJRSpBAb11ilE1qqw7NSUKmFEIglEGco8eMTo2zqCcdd2UMgFW5gnZgReykf4J1HnwPbR02qcGIMxNDlOHP09aEOQ8+Vl0vTkmVkCE6HmQishqP1bZctyqnT1bqlURY+40DYVQvPQ8RVIRqOjNm5HiGK6eQqhN1tt39olMuND0P+bXuGxgyLavjkN7DrXJ8HANUoABZOJ1KhtmBeNjIaHxsIeGHsed0Ev17H3KKqLNX2qb6i+MCokkukzDysyfldZxpV02tvBu8B+xS0KgxU8C7c1qddAgr3oikPdmSitSdvSGzU3O+DbSjSrCi+Tm98EJ0PtTU6uxxA6twCcj21udDqUUPaZpo9gbT59g== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2017 19:08:05.7019 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d;Ip=[63.163.107.225];Helo=[milsmgep14.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR02MB1418 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Bart Van Assche Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Acked-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/mr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 00175191fdc6..4d3daef6d859 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1865,9 +1865,9 @@ int mlx5_ib_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, mr->ndescs = 0; - ib_dma_sync_single_for_cpu(ibmr->device, mr->desc_map, - mr->desc_size * mr->max_descs, - DMA_TO_DEVICE); + dma_sync_single_for_cpu(ibmr->device->dma_device, mr->desc_map, + mr->desc_size * mr->max_descs, + DMA_TO_DEVICE); if (mr->access_mode == MLX5_MKC_ACCESS_MODE_KLMS) n = mlx5_ib_sg_to_klms(mr, sg, sg_nents, sg_offset); @@ -1875,9 +1875,9 @@ int mlx5_ib_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, n = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, mlx5_set_page); - ib_dma_sync_single_for_device(ibmr->device, mr->desc_map, - mr->desc_size * mr->max_descs, - DMA_TO_DEVICE); + dma_sync_single_for_device(ibmr->device->dma_device, mr->desc_map, + mr->desc_size * mr->max_descs, + DMA_TO_DEVICE); return n; } -- 2.11.0