From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751328AbdALTLc (ORCPT ); Thu, 12 Jan 2017 14:11:32 -0500 Received: from mail-cys01nam02on0075.outbound.protection.outlook.com ([104.47.37.75]:30299 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751033AbdALTIR (ORCPT ); Thu, 12 Jan 2017 14:08:17 -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-cf-5877d1f50801 From: Bart Van Assche To: Doug Ledford CC: , , "Greg Kroah-Hartman" , Bart Van Assche Subject: [PATCH v2 20/26] IB/srpt: Inline ib_dma_map_*() functions Date: Thu, 12 Jan 2017 11:07:12 -0800 Message-ID: <20170112190718.6728-21-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+URBgdOWFm8PP+B1aJ58Xo2 i8u75rBZPDvUy+LA4rF/7hp2j/f7rrJ5fN4kF8AcxWWTkpqTWZZapG+XwJUx6/d/loJ9AhXr jt5gb2Bs5uti5OSQEDCR6LjXxtrFyMUhJLCUSWLZyttsEM4ORonZC1YywVQtfANhCwlsZJQ4 dswUxGYTMJL49n4mC4gtIqAmsenVInaQZmaBxYwS7aeXMYMkhAWcJC7e3wDWzCKgKvH25CZW EJtXwF7i5punLBAL5CV2tV0Ei3MCxb/9v8QIscxOYteB/ywgQyUE/rFIfFrWzgjRLChxcuYT sGZmAQmJgy9eMEM0qEucXDKfaQKj0CwkZbOQlC1gZFrFKJabmVOcm55aYGiiV5yYl5JZnK2X nJ+7iRES0oU7GF/f9j7EKMDBqMTDu8OmLEKINbGsuDL3EKMEB7OSCO+s8+URQrwpiZVVqUX5 8UWlOanFhxilOViUxHkvRn8MExJITyxJzU5NLUgtgskycXBKNTCuuJXzZfe9Vy+a9l9lfcoV WHHXY2XxNKbJkt+ieubViPzx9TddyCtsWbtrmUeQklKizpJdW++l9Mf9Y3+VaFJYUVusuOL/ qUtrJryadmfaZqXJZxx2Om8PzinQT2aSWL516pJrdQUzgne4X7FUTi+46Df38a4p3aGzTFZN fF3GmNWwg/PnzOYzSizFGYmGWsxFxYkAzFMAlGUCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIJMWRmVeSWpSXmKPExsXCtZGTTZfvSnmEwbk51hYHf7YxWrw8/4HV onnxejaLy7vmsFk8O9TL4sDqsX/uGnaP9/uusnlMW3OeyePzJrkAligum5TUnMyy1CJ9uwSu jFm//7MU7BOoWHf0BnsDYzNfFyMnh4SAicTCNyuZuhi5OIQE1jNKrD70gQ0kwSZgJPHt/UwW EFtEQE1i06tF7CA2s8BCRomJv6RAbGEBJ4mL9zcwgdgsAqoSb09uYgWxeQXsJS5MPsIEsUBe YlfbRbA4J1D82/9LjCC2kICdxK4D/1kmMHIvYGRYxSiWm5lTnJueWWBopFecmJeSWZytl5yf u4kREghROxivTzQ/xMjEwSnVwFh2KWJtosuPeWIFH2cUrVaS10rYPEU33adt67XJjNqdk77b WbdMOhv9cWnWht9TOYwS9zZ798QycoUv0vXVSfzWJiK7lEugV0Hd70sQ006mq/3Rx44LTV0W o5XeZy4tWRw7yyNJN6jS2eS85Ovigjdv+LhzCyJqOJ/f9V7M1nJb8ZL3udtcSizFGYmGWsxF xYkAdoM0zLQBAAA= 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)(39850400002)(39410400002)(2980300002)(438002)(189002)(199003)(33646002)(81166006)(6666003)(4001430100002)(106466001)(92566002)(47776003)(8676002)(50986999)(76176999)(5660300001)(626004)(50466002)(356003)(81156014)(48376002)(36756003)(97736004)(2950100002)(110136003)(5003940100001)(6916009)(69596002)(68736007)(54906002)(8936002)(4326007)(2906002)(1076002)(189998001)(50226002)(86362001)(38730400001)(305945005)(77096006)(2270400002)(107886002)(50929005);DIR:OUT;SFP:1101;SCL:1;SRVR:CO1PR02MB046;H:milsmgep14.sandisk.com;FPR:;SPF:Pass;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD026;1:xjBLBfsldB3aOPFbmNjaMpofcchJhlw3NzufXyWtZhRaTTZEQjNRk09lGnBU2tljE4YT9K2nYtmQk55nA8qYuSCJq/Ap0A9f/5UXhwlT4K2AbdiGIKU9L+ECJhQDQc10es/PqUdpAxHVipmZSbLxkaVTa2Lgm7wz3/FOybBWw+24IUD4BuLOWAuQqOip99j5sX/b5SRZ1FAX7m63Iz++1F3cZR04y2tUGEbSzPe77GMyFmgdIQ1JuV5tXS6y6DtXH1wec8G2SMtaUvySdvciRMdW6i9UVIbHSLHoUEDVUgFGC8tLfDiqyRK0g/RTJDq+5LJStaZEU5BOzLrJ8uF8d96o8YFPLTDz+VdErL4AStUkwrs0lgtT7oH8S43ixmDp0qgelEqmWflXDHAlC1lE3G4uhy5z9aAMozHqqraZ/HujisBm4okUPoZ9DojgwGvkNQB6S7iWFLy2quILOovfo+N3BzjHbTP07ojPnm8lxyaK9JBTME003VPFfLSHkmaL X-MS-Office365-Filtering-Correlation-Id: 68027254-f48a-4293-2f7f-08d43b1e57c8 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(8251501002);SRVR:CO1PR02MB046; X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB046;3:+27CZlrdj5Q/dd9SkaNqKHqxDICy1b53+BMi3dKPINa7nl5H0mSvVxICFkb6OMdKYAKWm14/Gry6v6e/dMmVLuuDl3KbeEAWgwFcIJ29fHgNabXDLRduC2da4B52kT1SJLic42zGbOwDMjCl1Ivw+nlW+YX2r5ofN88aX7hecjy2EiYMih5b9BxHo1KTBuejFVPphl7k4/WhUS7KC1nMX5iOoNhLcNspFYj4jJ599vEtKQJmwQkEqcRWBpcAC2B9jD1Q770tJVCFiyCALP2ztlZQlXRDTTR09PQJRnrkT3EpoyUxJhvMsR5yTgzXLZdJmmdJR2PBVQ2fT/OXrrdNEfJ+mRJTgEiK2h/yK8Mnq4FBUhfXd6no6V1v+I5S6nxSK+mG0edH/spDehrUp1YoPg==;25:+HHU6q+R07/KOHb5mT7E/+iA9QNLO+mCrAfAA909CXBwJ0cffKrXUYEMJSWmSiRS1vunmgjQ41ppavXjEgigOVgD48lrYGvsSn9lqJoqEmjx9spvwWSLfoNT3TctleqUbWjYzZj2xzLqfUXEqq1xqWpgPWCBIHmw9a+RnmFJrS5YOCCtHmgBZ12St136w/epmOIuEbkOYlNQQCvrRON28YQU2adi+3fSjN8tG8ult6YiJWONDTWFRF8nFFDRZCHRLrH3Cz5a/E5VShUUuY8blMRiJejUETkj8bRcb0et3EJzcyXuR+kHtq2TUGmpHistd6AQqQdf08qxCeJLVI0pN3R1wYHQMjXtWpClDoLYiOlqMvk+9DThWzPu3TwmziES74QSm2yRqUTAqgIDR56G7jCIfLEXkXwFckzSnvHbTN/dhsmkxm3+eV7RWZd9xl4NVUjLKnZ31LOrfHLcBcKcFg== X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB046;31:pxJDDRiy+h7507Qp3g/PYt6SclnfSq4Q7gOVjcxsCq3EHqEbWeSmrGDVuLLV8fjauC6dNs/Su2YS7+5V82m/IHYfPXaK+/B3sJazdHMKSBI0Dz95wnNhVrWEYOddO2bXlmfR4VQLObW21HFcquvEVy5S8JV3Sfm251OP6DW55ypjaElKAYL76yzkQ1Oj0FXofAdBQ/Bw0F3lWq/+sbhJCAqMghdP5Q0tvgJPtQWjkdbH4OgX+2ajslYOQxWemhWi5B0WcEeVV1EGIq3+ji2slw==;20:W40ST8SjB0unuSTAmY9u5o2kAE+wqLoJUELNRGrUiZep8NmJNyDEvGHmld3i+O7qsogZv16HZUNDVFZuNOtR7aPWO4wbgu7WTL8xaYbOyrQWob3ClFHdud7SBQ7xzRH3BmIoDcIx24PDfplux2YeCQXGJniyD1J8u7DXfATjLAefYXXuPc/HHTRD1bNsLkGCcziuQrbaO586tZTJl1o3X1y4gkxMpv7Ln0KDNy3A/Ntf7vGqKTzR7m+8976G6VHaZqyuGb+i0TbhxUAvgIH2OPl+Zi/VEKDE98mZ0jK4WbFaJoL4exCFz2X37ZOwXOkdEOJ/BXdd7br+mcgNvydUSMdMA5/CDE252Qi/4gJzWHKDsHhwU3YheUMvnTgrmoUvwzmPQVWh6fzkPCw7MSxDKAiHfVQ3S2YWo/dAuR7CQdTQyTzbSS3BjG11gYaENwA11f0Rgq/y+H9Q4/CYCMjr5AaWYzpjMgH9aippceEkOBS1FeGhgkCcjRqJQLCWV31e 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:CO1PR02MB046;BCL:0;PCL:0;RULEID:;SRVR:CO1PR02MB046; X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB046;4:R3lESDgM4JDpJhxR5m1SO/4tjaCyHv+hmJkQV8axWqhnAe4KZUEY9CkoYY2P75AMQ39Ok49t3rqhi3526volTW7DgBsTwmZ82Xy794RNlvkqm/3sOFMLl16pwkj4P89s4xDKJIXT/Cf9Xxn/GCYbC2ZNqCbPS+togvTNq4JbBs/9WhKjjxnWByyGnUlhIX8MhZ2F21Hs1bwixXzu8QbIkFB6YX3KooS85EUbjI2gHpO0mmkICAlccsg7DQNejWDu9cvitI1zEYqmAQf6/cKwB7yGlGu5evYs1fSxdJNmGwo+AWgiHoKhwACfT59WMrHkVW2fXfaj7lcfKAhG/U7uWh6Kj/AXbbKYze2aUksMxliDnXBgoXT55k0KW1hWWNH1b6/J/UbA0/X68FPKfF9dt9wxxZTMkbSqiRpABkdX2oEOAk3o0dHPYHWWK4kolIymM5RS31ezT0ax5kowLaiSiDShEZwzs846g+OqPy82j0sLdmg9iewmNNQxOB9zOJvmxqb8lqGUpB+OK+Vq/UxgqjrdHBZVeDGQ1xLoNlexqvtPmBmsjOA0u+EsS0R+U/wGgr2CV+5hTWwXExxwew0yyGRRYJ228+4jVjiO+CA5zzhtuQ/zlf6lpHIVbdVzjdi4JYWSW4pM/imMvk/FCodzkoW/hetzVeyNi6T0rDP6BOL5vFdwGUasFLGRbqjkmiHFwGxwMMVBjODzX9O1w6WSMN0pEQhti1Ff6M81aI5Bms8= X-Forefront-PRVS: 018577E36E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO1PR02MB046;23:z3MghkzM+3MbrcnHCNyhsk1g3eu1BZcBdIECBWTEe4?= =?us-ascii?Q?dW/iMvAgbR1C7Jj39+ZHJmmz5G9+1sgDXykSZUnDpnSxERE3O+X7Xi7C3/KP?= =?us-ascii?Q?fNgQ+QUp0/CEi8Q1Icdsl5RVrgydOhiJiUx9/fzvgeWjTkgE2gRYoeZdZ3/f?= =?us-ascii?Q?IJoqTcd5Nx2Hlj6ynSFabfIYIXB35TiX2/DsEgB84Uh5ZTEVGkKyEfCeP2p3?= =?us-ascii?Q?A4wMTZA9w08VFaRShuCyUs6N/GgfrnHlWnllSqU4+FuJOLwVdEgZ2HdefI4N?= =?us-ascii?Q?FcKhCzGohTbQ1gKFs8z1F0ufraFWY0NrKb9LiD5BbK1J5NCQYaQvQLLRXnCU?= =?us-ascii?Q?gqgdVlDcLtyzbEpPkQm1xE0v8SHeKeNGcSq/z2XcmCmo7/PxsP+lPlELtS6I?= =?us-ascii?Q?0tN5uJ/sE37uQw0EoOw6KUVTne7ChE0FetmBOZqw9zaYfiq1Oy9BCahxpKV5?= =?us-ascii?Q?HvCx2DO+ZCJBAwfLib72bHfTWZo9t3dGWB3hEM4UzQ05ADMU8z9340E9rctG?= =?us-ascii?Q?XipwGUoeid2Tt5I0IyTN8Io0iB1ufyuN2aS/T6lKrVNnJsMZyA/JHG6ioEO2?= =?us-ascii?Q?8k+gLeOionj/wSv+gS/1ewOazwD20k1V9dIGTr6jEw2u7XnpmxIqVfhJj9D2?= =?us-ascii?Q?APQv3h/ieUc8NJuOpgHrFqgpcYFhfVTgyfw4LyZm+QjNaBl72IqYBF9Az6w8?= =?us-ascii?Q?Z9lWVN/DL4E5pC8tVIH6PahkkrSiapHOXavB+5w13AA4222qa+HIgZ4eifwM?= =?us-ascii?Q?xUO172HCV1+ocr/3Te+EV6O/OfZx6zxQjAoUel4ZkVsgmywF6+qqiICMEey8?= =?us-ascii?Q?z7HOR/ThtTcWHAaySZAwgdCaOQg38HBeJrMEyiKrV6PiPElis+fnc0aemWna?= =?us-ascii?Q?+F7VuJr6pcA8OclaRhBitJjCb5fE89B/s9qlQkv7f7XY/PBEo/2h7KBbcsJI?= =?us-ascii?Q?hqv67Rr1DM3iOFWvjx669EfhVo/rjtSeH1lKGjgXUBokoaCo/jWJlWZMvSIZ?= =?us-ascii?Q?AY9OkUhSd4tIb9pCOyLTHpnYOL5TehVCIU4xC/Llg6PzsZSrJTl5wDbWdkGP?= =?us-ascii?Q?6npumW92d/IdZaThbRJgcCKASOwyJfBp42jJENDt2DZT6TOZgFGFNh9mX15W?= =?us-ascii?Q?eYXk/0MAFcFVmEcfiqZi5Yt/bn72TT6oQedP3/g7uv/w7sYdWLTfN6PPC01V?= =?us-ascii?Q?RJEW06pK6pA4JrBgcXrxAxAljNGFiceVaN?= X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB046;6:FwqvrTgLSHG4UAr0C+BN+A30gd3URiikO6w5qcp5aI3nAPLgiqsVvfSiYlMgIhnBY5M/bzCXyjCmORJf43hYnrwIBttKIgtsRV0i+/JCFc+HWbOs8WB2cwhQ3r4hQiiekR61z0G0G53QVfA7wlTju5DUQ3m2GEEgqQvKryNGXoP8QrdDaqtDVOib4Iw8KXKjyAP666HjkKu71PVcIMJd6mc42MuJzPVmwXOqMkOjRUZYUPE5stvGf8yhIUQlkE7wWJwP0Flp9q1HiHhTqstIjnYERe70tIUU1BYTsSsk+9ZLD2E2UGZLCHvme6QoZWM9sgxdhO/X/8LAykkoKN31dfiKv8z3BS/quSr/JubPYW6Lbenj+oQGRBp2VVo3e1OeDxFkmM8xrzD2pqFUFe3DzPbtWFNzg+pYbPt0YnNugF96KbZnwExodvug/pYybseW4BhNepvMDGe5MJFHBz82qw==;5:Ypf+EwosfNpth2ang1zu44umuZtD2KH4lAoVrUyMF59XexWC8NM348a3Gt6ekxx1t77L1L24RMJoGRNbwCPJn+AvcHHrsOp/3wRUIDtSYS5YMMMSuLF6z4bk7CAjPJPhufwaKbN89BCAw+wmAuOcNA==;24:O0avYC7bs40YMCHCOIR7Y47u415RCPXdQTSB/paPsmF7xMlsVXGJHq1Cu/xvqil8pcLI4MeGgXZOOsgjk8n/zXReIsLXpdg5yaBLEE0slOw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB046;7:hohswQOYjk063ByVFf1q1Oorl9SJXuny6Bhxx7pGvQWgufAVLcDXkOp3r7uuKu4gE4DAq2G3DHhPdP5L2EwYoRI+QYHXGCk9JJ12SOIv2OOKxFSYR/duHoClLEZQG/60UG9rrOnhosN6JsrzxW353f+xDAPKivyomkc4bHmuF7cKo5EcRM454Umv27JFg1ju8QIHIBVmWQSVX0Q89BYtlqSeJdcOtik+y/MwFcrHdzW9bnA/NKIH9N4/BBHNc6H4JKGy8PaBTy2koq2uMIjDLwKBq8mqpveQQGPAQIdgp1knwI/MCVj1InYXIHVSh7M4vRkGASfHogaVbE8TheMEglC9Wwp7urydK4y3qLlW9oh/DzkxBalmHs0U8HvUPdj3OBu/C5tWwKsxgc65cwFB1KUsRNROrm1JjhmpT/ci9Jpz0KJoNFmvqv8NRGwCBD94B/hi848eih2yUzV9brnkkA== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2017 19:08:06.7949 (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: CO1PR02MB046 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 --- drivers/infiniband/ulp/srpt/ib_srpt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index 7ff9de063c53..df42ae43bce0 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -626,8 +626,8 @@ static struct srpt_ioctx *srpt_alloc_ioctx(struct srpt_device *sdev, if (!ioctx->buf) goto err_free_ioctx; - ioctx->dma = ib_dma_map_single(sdev->device, ioctx->buf, dma_size, dir); - if (ib_dma_mapping_error(sdev->device, ioctx->dma)) + ioctx->dma = dma_map_single(sdev->device->dma_device, ioctx->buf, dma_size, dir); + if (dma_mapping_error(sdev->device->dma_device, ioctx->dma)) goto err_free_buf; return ioctx; @@ -649,7 +649,7 @@ static void srpt_free_ioctx(struct srpt_device *sdev, struct srpt_ioctx *ioctx, if (!ioctx) return; - ib_dma_unmap_single(sdev->device, ioctx->dma, dma_size, dir); + dma_unmap_single(sdev->device->dma_device, ioctx->dma, dma_size, dir); kfree(ioctx->buf); kfree(ioctx); } @@ -1492,9 +1492,9 @@ static void srpt_handle_new_iu(struct srpt_rdma_ch *ch, BUG_ON(!ch); BUG_ON(!recv_ioctx); - ib_dma_sync_single_for_cpu(ch->sport->sdev->device, - recv_ioctx->ioctx.dma, srp_max_req_size, - DMA_FROM_DEVICE); + dma_sync_single_for_cpu(ch->sport->sdev->device->dma_device, + recv_ioctx->ioctx.dma, srp_max_req_size, + DMA_FROM_DEVICE); if (unlikely(ch->state == CH_CONNECTING)) goto out_wait; @@ -2385,8 +2385,8 @@ static void srpt_queue_response(struct se_cmd *cmd) goto out; } - ib_dma_sync_single_for_device(sdev->device, ioctx->ioctx.dma, resp_len, - DMA_TO_DEVICE); + dma_sync_single_for_device(sdev->device->dma_device, ioctx->ioctx.dma, + resp_len, DMA_TO_DEVICE); sge.addr = ioctx->ioctx.dma; sge.length = resp_len; -- 2.11.0