From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751045AbdALTKh (ORCPT ); Thu, 12 Jan 2017 14:10:37 -0500 Received: from mail-sn1nam01on0074.outbound.protection.outlook.com ([104.47.32.74]:14592 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751090AbdALTIa (ORCPT ); Thu, 12 Jan 2017 14:08:30 -0500 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=bestguesspass action=none header.from=sandisk.com; X-AuditID: 0ac94369-b62949800001ff92-e6-5877d168b31e From: Bart Van Assche To: Doug Ledford CC: , , "Greg Kroah-Hartman" , Bart Van Assche , Mike Marciniszyn , Dennis Dalessandro Subject: [PATCH v2 09/26] IB/qib: Remove DMA mapping code Date: Thu, 12 Jan 2017 11:07:01 -0800 Message-ID: <20170112190718.6728-10-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+NgFnrELMWRmVeSWpSXmKPExsXCddJ5kW7GxfIIg8bPRhbP975ms3h5/gOr RfPi9WwWl3fNYbN4dqiXxWLD/0Z2BzaPxXteMnnsn7uG3eP9vqtsHp83yQWwRHHZpKTmZJal FunbJXBl7Ly6gbngvlHFh42zWBsYX2h0MXJySAiYSNzvaGHsYuTiEBJYyiSx9fEFJghnG6NE T9dpRpiq/zc6WCASGxklZrW3soEk2ASMJL69n8kCYosIqElserWIHaSIWaCdSWLD2fvsIAlh AUuJxT8hJrEIqEq8Wv8cLM4rYC/x6GcvE8QGeYldbRdZQWxOoPi3/5fA6oUE7CR2HfgPtllC YBqrxL4JE1kgmgUlTs58AmYzC0hIHHzxghmiQV3i5JL5TBMYhWYhKZuFpGwBI9MqRrHczJzi 3PTUAkNTveLEvJTM4my95PzcTYyQkM/cwXj3ifchRgEORiUe3h02ZRFCrIllxZW5hxglOJiV RHhnnS+PEOJNSaysSi3Kjy8qzUktPsQozcGiJM7rdu9LmJBAemJJanZqakFqEUyWiYNTqoGx Mt4gVWaDUNKz/e825oW1rnM3PnnmWcCa0i7LA7FXdmQ84XuctnT6tpz3hy/zq2y7/fJj0tXL D8X6F+2rO97Ik7yqQWL5hZPiArseJ4anNIlaZ+S+uhc3I2RPpTf7Kokjac07rCeJpm/dKlq8 f7Lajeia0xu4+m/p/rrD/HjT3mdxLlbsbkkpSizFGYmGWsxFxYkAVgpVO3UCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIJMWRmVeSWpSXmKPExsXCtZGTTZfvSnmEwfU/0hYHf7YxWjzf+5rN 4uX5D6wWzYvXs1lc3jWHzeLZoV4Wiw3/G9kd2D0W73nJ5LF/7hp2j/f7rrJ5TFtznsnj8ya5 ANYoLpuU1JzMstQifbsEroydVzcwF9w3qviwcRZrA+MLjS5GTg4JAROJ/zc6WLoYuTiEBNYz SjxZ85gRJMEmYCTx7f1MFhBbREBNYtOrRewgRcwC7UwSrRPWs4IkhAUsJRb/PA3WwCKgKvFq /XN2EJtXwF5i87lfjBAb5CV2tV0Eq+cEin/7fwksLiRgJ7HrwH+WCYzcCxgZVjGK5WbmFOem ZxYYGukVJ+alZBZn6yXn525ihARK1A7G6xPNDzEycXBKNTAubgsLb8vqjJPxOXR0Ydm7RwmP RQsyT29q3PM4aJP6ZNPnxf810968Y6qMl4pneRrv6fC29dDNgvxElmltucfmnSvZX+q5+9eP DuEG6wWzzgXmmB6RtihOq0yy8ok+uGnl9YTgB9ptMx/4HjB7/vpuX7T1Xf2d1+MuWdxuEmI3 YVh9+u5LTwUlluKMREMt5qLiRABX+unGxAEAAA== 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.21;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(979002)(6009001)(7916002)(39850400002)(39410400002)(39860400002)(39840400002)(39450400003)(2980300002)(438002)(3190300001)(189002)(199003)(50986999)(81156014)(86362001)(8936002)(97736004)(81166006)(76176999)(47776003)(50226002)(5003940100001)(92566002)(8676002)(50466002)(356003)(68736007)(33646002)(305945005)(189998001)(48376002)(1076002)(2950100002)(6916009)(38730400001)(106466001)(4326007)(2906002)(5660300001)(626004)(110136003)(6666003)(54906002)(36756003)(2270400002)(575784001)(69596002)(77096006)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR02MB1413;H:milsmgep15.sandisk.com;FPR:;SPF:Pass;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD008;1:R8s3V13zBIob842cDuwR6w42pzKeRP2Ogkiqz6nmKaVsgsVBQv0n4i0NeSYjsRSQ7uUaLIlABdil9qA2OQlKT6w6EF3SlJUswL3tzGyp7azPgNRyJJzxicbKVdE4IfTz7fqcE+KwnNpppT1gP9edZnBkwLbaQFLelNoO/zJ78RzjmA5EhyzUw2+9klhvT9wKV8oL/t80XUfqcNaV2iT4HH8AO0LivHonj2ZJVr4wJwy91qIHYjVgg3wI13Hvwxa05l10xwn4yZFG5qS7Y7Sas3TInSHhNIyCHhx5G9suGUzBTJstng8azvvIYPlKaUMQ0gzfKMIX9mQZTkI+Y2AZK2N3cF7eQiSEtjnx8RN07JwpBm4nDXVwihpDnWj4ebN4FEFZXBXNkkIaT6zMFDgH1/P8tL+0dBXZmOExncl+Hhq0E11YkqVg/hr1UDN4ce6hOIgbPUhY+sa7wt46F3qjfUAJnSnyDvcN1hqYGNU+znX75The3w0JilpphkxlKsBnoc8A7GgzkXicmOoAnb9OlTjktM10i25bphNqPHmpa2xUQ16x2TiCvqrciryI08Qb X-MS-Office365-Filtering-Correlation-Id: a8e99274-f7a9-4ed4-a5ea-08d43b1e564d X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(8251501002);SRVR:CY1PR02MB1413; X-Microsoft-Exchange-Diagnostics: 1;CY1PR02MB1413;3:xYz6P/GrnSdvCV1slJS1CGphZVWE1yEabRVrl7S4doEyUV7zWO13wtdV/ANBCBEJhkBPLvb3Lt16bncYXmvvX+Wh8PyO+2LHUgE+HtNvQvxiw0XAf/Gltzt0sUdf7FySspROok2xhjxmuYBKw2O1hUHOdlVHw2y3U/yuxynaf4TKFLkApMy4LbBK2F5PKFm3Sl9q7rvCQIlv8eprPB/R9tF8W3arVtOMcFJWTOg3nMCoDcdNddVpuXUlI+KVv/X3ipBZRbeTHfroCG8TTk3YdDeOcx+0BxioDikBHTwolz/Gp2pKkz0FP4mNy2Vh88lGXBmH75zya3Fwv6Bnmz4ee9d1yXbAImld5D/QLfhyQ6Eh0XZPU1+Gs/kRw5+Pt1h2LhY/C3X9ZOMHyfPF8b2vwg== X-Microsoft-Exchange-Diagnostics: 1;CY1PR02MB1413;25:tONqas7OoLBwZzfUVL3gMKi+l0MGmEPZjxXUT7Wk7QhXAn1T97sGk7PfgrfIKksZ/QzP2dwomaMo9Cz/C7YemTZesCyAMIEcaeoph0SMilNKW9Nne+4+/ZVd2BlW8kyK5mVgkTq0yLboNArcwtVBuN47JVV96EldGLJJVVlEZ8VQh6r1e+KxXoFJWHnYl1jqMoUlCdFsB1EjtETJZskHKjCNvHyY04zWRfB04dYx5o+IwJIQVFJX1TZgLXCWXvr8LOH94xEqZt91X8R0Qqp5/8rfSl5NH+kAogMErbupin2q1dK/tKfWbv3HGb5wOSx05BCyIY0mFpx98Xrzx0od5/n7+TtgE0KZnhEFcGuPpz+EMZailbjcxkBcW05eD8u5d1o3Tf3ORfTEKKzAuzpgyvzw+qWgf6hqr2BV9227umZIdtzd0Y0e9GpEqQRoGqhfxhdKXy6kbgizbGZaIGrlWpoIHH/hVeqHdByS+C2veGlOGuMJ6KLF0R5rn1T81zORE5Tssez3l3b2loGUFNoFLjjS+U64vDV6/N6F8HIIxjsBog6kc7VX3e6eR7axer1/nUCDezYeZ5on1/veZUmkotrROZpkRVkvZ+79nex4CZN2CC5jnhZnsYY24IyZXwSIo46N/b7E2JNR/M/XvrHvEryHjdMPCYbAOUSRtYXUtGRZWbugFYQ33RNagbWSaVVuBjJ4qppR+dd2PFyRQSm8M/i/5QkZKS3js6NIF+nUD6lCNd+F0EEuoY1SWWejPxUPfP20LUQuP/FfOQGYyjgVujAiSRTQWOKVt3l7wgfsLGbTWG/RCPzLjkk3h0kAmthS X-Microsoft-Exchange-Diagnostics: 1;CY1PR02MB1413;31:lo7yLB5y/0niLztCRmLQo57KYgdHlyzUQNQYOSea6ArNViGstebi/Tz/hA3/16EkSr39lXLZg77C9nbITL0VNJHOWVRtBeZcqvsH3Hy4EGzuIbcsq9MdVXWTwMQgXe0Zw1VAHZ38rReCNJ1aAkLxG/m7ocxC2urAHrigGdftHsgDMh29cLYv9JGmADaas5i9XVKb7T0Z6ZpSrTXD7pSh+NqrtTN/HI3z7YAM/1RVxkurqEPZT1uHP0utPJwyCr0MWmsBvszTcsWKmH+iTWly8w==;20:RT6+HqDCcCkwE0GlVFBzXeyLvQw3qfY3LR7cfuxYrtBp2OeIR/Z58WkYnAhTVpyAez9yW9M3aS2EZPFjP0a9Te749d1PQdtWogBYR1SurnONDcaN+HoYUlpQJ1yAYq/mT9OqdxyfhKCh2lJz0MP8V7uQzM+xvsX5hR+jyW3cpeGEM20qcdSJQU527DiEVr8riX6CYj1Oi066eeBqu6aYlFhrleRvcsiinHei0ngic/+yLRD+mzJOpbGOh2MALar19/YN3jts0A5Kn12luRs7xQNplX+L49QxZup21l2oOdf08GFGQT6XU3ifOWriFKc3vzfebCOoBRYhY3Y1QRSAPGEXUAIY/46cF3FvfqpU6+QnuG2D14zL0ULWb4Et6tSdvCfsozce9Mpt5/3KpekpvGHiHG9+EONhYwakJCh5XD9SroccmA1hqTL/fnNoHKuMl3JN/GvqkhMzy1yKx8Skbu1YTJoRVHCHa4FHTZlfeTmV/A7xUY6dWZ+lhQPr7YOG X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(13016025)(13018025)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148);SRVR:CY1PR02MB1413;BCL:0;PCL:0;RULEID:;SRVR:CY1PR02MB1413; X-Microsoft-Exchange-Diagnostics: 1;CY1PR02MB1413;4:uF19KbB2jbo4A5H4okFZYBFuB1FFEkOGoENMZtrilCWTUvu2hh2RqdLL6ZoZIHB0pWqblTYRD/mQU0iDKerIpHZ4GYNcSyANOOBt39u0eHTvtoPYYqw+noaoRtFAlT1IeTyY5NLHlMg+XrMNkrPzdRv+GYmA3gxQQd2XUsBCe49g+FXRUfbbcQKlXD8H5CYXMjteBL2mvko9GtjLvENEHj10Gzb+j7dE/fqQ/7sEzApRVhUtfbukgpdMyqFkJfZzGqpO6LBvHUv+ZclVFSQMcJ3UCE9Uq7DIbPq8aJ8kvZntU3bOWsUUkofBi4S9s3ms4KJq0ZmK6Alq6KLd1jZfLoEm2D6Mc2bMrJI2QovH6ET89XjaHcZFszXXpaLEUGbhK/bBGAVGc/A0WCuZI7k1eyKtdx9zrg1hNDX9A4bWlOww9+99o0owIBIhW1e6fOiFTpzH4TZ4yFSJiF9G4w/5nAOI0SYfvsioTOvZ2JoUja9RIbldKsT2ncs27R3IkvBRF44zL7wg9A02F2zMjO16/u5y7Uyo5j4U+fURJ2FPUuxI0Vmbm4SdMVpUH0l+lQCPKy95+cx8J2sbpqMdEVfwP/lHZWPaNsNgz9YAYeCkHBGEchOmC54hIlxEdkMpcJ7oSLAAQBw63WlsqtGmvf2cBlLrUag98Q4ef8nQxcZurnGyaU7leRBJ80W6jEcvUaVQh5BfsyNOHhTwKWuOcYp0+Q== X-Forefront-PRVS: 018577E36E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR02MB1413;23:XIQIMVohnEkMoHcxLtnJIfRao7OkFkqOK//A3J02c?= =?us-ascii?Q?cScTXS9sGNmv/LRBpNOkpTnUbiVSv76sDWVI6nlb8dt/j7AwrOUbZgiMlfUm?= =?us-ascii?Q?C+V7KpJNayS1gqoWHddfwu84iQy602vre6XmG3TLHCGslzXZt0uV25eOiCFI?= =?us-ascii?Q?eLU0WF0+fesLFAZV7YAn47/7DuVNjENpaQIL0uELld3dfdGQDFJzrTRMcPzP?= =?us-ascii?Q?k2u7KBYm+YOKu4nIOXx5TOk23jddznbX0/HaoDDUfDxI82ZoJSG26yvCVC8K?= =?us-ascii?Q?2Uom8Gn01hkIEOhYGBjdpoZ5FAaL8FnPJYtP2HaHet86wvmwVLhSi5Stc/9L?= =?us-ascii?Q?1uTlz9I1up+tF5f3n115kntdfDC3oiQjZ2IDlVz1/JQze7+dGfFIYFWPN3Cm?= =?us-ascii?Q?swuget3Jhl8RuYtsV35dgw5DO9uILUSc+QLpWakSfAcRsvFd3F7S4wynRlcL?= =?us-ascii?Q?FOoac7ZO+BOguVJ8Uvoqqk+3fuaUuVNdn8AsXNegMMcBYBYPM90ndhjtKWxU?= =?us-ascii?Q?QMGGbNR1dJQzgE47aerm4Wxrbq954ZZlo9C2fn7qn77F6j+DfmJZplE10rJ7?= =?us-ascii?Q?Og6BMehfKRXG37V7u+LekB/yYbPl9CQc4adouZYczhgo8GgfN0LP2pD+4vo+?= =?us-ascii?Q?W4GlHf3+zu/LtAuxOxKV8rPiW70ocnIdTq1cmLXk7fdQPFEQQpvIqdr6n+QI?= =?us-ascii?Q?oxjXis5voSVQspIn35hfqsMsiYu7la3MTH/Uf3erbcWaAs3KLe6R0eNf4IDm?= =?us-ascii?Q?iiECXhFub2akB7d/6UGsFzr17LJfop9NsE7RfpFPvshck0R+aXZYG4UqbcMb?= =?us-ascii?Q?f/Jcje9/K6cOJ7cCBkpOc2jplOsQ1T6JXtOtfrZHfQbnPQTqVj5y1UQFmziC?= =?us-ascii?Q?2j8izSZj4552YQ4tltohjzH7z+GftoLIloY/kTneJHrWX+X59yzdVZu+eqPl?= =?us-ascii?Q?iczyVDpLsdAGNtuJq9S8giYgby6ZfJP0H+KsqV4zFVNLZiGTwieZR8jHbLMX?= =?us-ascii?Q?qw4FU4aW/9uT8FiUTcvb38AXxadPJk9hCGg6Y+jaQNhpzpcFyVKIkHtu4HCY?= =?us-ascii?Q?2J7Oue1c8DXXtxt9jFWJ9tyzn2pacBtJfhJ5SGGntBy+EaVR36Vho76tSpw+?= =?us-ascii?Q?uotZnsYTH0kr7iKKHEMnK5kJqnUdWj4ioVjOHZ2iF0ooDrxpPB/qmssGtgkT?= =?us-ascii?Q?l/ymUxBuCljQKVyuUAM8eiy4FrEzR0SHOacuA9TicS0Racmv2ctO9mFHIbaI?= =?us-ascii?Q?siSSpsF1zIP32o/rvl0efSnM3o9b7CEaw0U83Wv?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR02MB1413;6:PVo9uCvBobogs8Cru0J/1wXRw1dZ34iSB1m7X8ETdhWNFM9rz0gudd4+eIrU3u81vJoSHImq+MwvZPRqkBq0mvKJrnQkw7JUixl4T68bpp7XQVYoYRXTthdSyq9cKuc7KaYzvUb4wCEGcsgrUVdiGpOkT0toyZC9Sn26r+RB5CCVyJ/A6sadwY8Z2NVyffKrepFkVA8Dm8pXXa85uuD5C4v1NBSWMr8pc6HqSUU1m8g+ctJ3doa8AGOYa+rV7UstevtDalnrgvpAdF3la7jfsJzsSTnjbC6N+BB756SPqzjoQyE8ymCJM7hanE2uUNf1UYXOZZ65XWFS4tIVUyAoLNxs2ct06XLshoC08W+H4yYm0yOuqR3RLdCfZOsC0ZDYqyQAgl+B/E0RMgD1y1bRXl9QiAOyTTUP4Vn3or1PV6mhs3wa/p6xm1hG4WMFBi+S8CBJ24ZLjsG3po/KlQoaWw==;5:AuOLbdHLVjYz7ebPh6edNE3E3baEp+RgR1TgghrzB1pYV5xl5kSTOTBAbS1mZg44Kuhg9QMZ1abVfN3YlNEzu59dZE4LcRVO+1mzWGx8T7wfvZCDpluJDgwfCFK3iDuDJh1S6Lhe/PIuY10Nj6Hrww==;24:HLTXMuwgJ2pgn1kuwr3zOq2sZ/f9Cdd8eVoe89F5IO0HLfkamheSVZlXmLAsQ5vXaJmYKLBaES3nEzhFuuCBo3WvG/bJkd8RUjtWd6s8dWY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR02MB1413;7:a79qtwSz3vhaudYw8DqnCJbEyZKTGds2B9Eicr/OLes56lzHl2WmwS37YX93f6o78sut1SyS1jyyErvb4YAMJOfDNUVj5txS2J/1aytFqrot5LKQ/KD8rXYzI06RWiAhpx391lWoyUMY7Vc3Z4rDvk1ok3yx8bPCu1mM0HMm//Ik8Z8A6kSXwECCubw/QugS6Hk7zdHlc3ZIk2tDkUF0JR+bvyED2J0TV2q/Eiitx1gqJFfcZACP3mApjDC7Sj/ply/pRURSGjGXYiC2K2NsqnGYdFyQ4MCNHWuWA94Dv5ud9Sua0yFk0nkRtmHF8OnVrpxQRhPSHPbU2fvfGq28JNieOBCULEymsTpL3KSYhUDEKJkX2pIj1kerp62q5/aCUZcCOGzZrETFzcntTpv0k6aCXuu78fllSQNJExoFmRsyfaKei1IinZFP4i3QnJKtgay8aHIToM5I0kjYYgJtkw== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2017 19:08:03.8929 (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.21];Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB1413 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The qib DMA mapping code is no longer built since commit eb636ac0e49e ("IB/qib: Remove dma.c and use rdmavt version of dma functions"). Hence remove it. Signed-off-by: Bart Van Assche Cc: Mike Marciniszyn Cc: Dennis Dalessandro --- drivers/infiniband/hw/qib/qib_dma.c | 169 ----------------------------------- drivers/infiniband/hw/qib/qib_keys.c | 5 +- 2 files changed, 1 insertion(+), 173 deletions(-) delete mode 100644 drivers/infiniband/hw/qib/qib_dma.c diff --git a/drivers/infiniband/hw/qib/qib_dma.c b/drivers/infiniband/hw/qib/qib_dma.c deleted file mode 100644 index 59fe092b4b0f..000000000000 --- a/drivers/infiniband/hw/qib/qib_dma.c +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright (c) 2006, 2009, 2010 QLogic, Corporation. All rights reserved. - * - * This software is available to you under a choice of one of two - * licenses. You may choose to be licensed under the terms of the GNU - * General Public License (GPL) Version 2, available from the file - * COPYING in the main directory of this source tree, or the - * OpenIB.org BSD license below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include -#include - -#include "qib_verbs.h" - -#define BAD_DMA_ADDRESS ((u64) 0) - -/* - * The following functions implement driver specific replacements - * for the ib_dma_*() functions. - * - * These functions return kernel virtual addresses instead of - * device bus addresses since the driver uses the CPU to copy - * data instead of using hardware DMA. - */ - -static int qib_mapping_error(struct ib_device *dev, u64 dma_addr) -{ - return dma_addr == BAD_DMA_ADDRESS; -} - -static u64 qib_dma_map_single(struct ib_device *dev, void *cpu_addr, - size_t size, enum dma_data_direction direction) -{ - BUG_ON(!valid_dma_direction(direction)); - return (u64) cpu_addr; -} - -static void qib_dma_unmap_single(struct ib_device *dev, u64 addr, size_t size, - enum dma_data_direction direction) -{ - BUG_ON(!valid_dma_direction(direction)); -} - -static u64 qib_dma_map_page(struct ib_device *dev, struct page *page, - unsigned long offset, size_t size, - enum dma_data_direction direction) -{ - u64 addr; - - BUG_ON(!valid_dma_direction(direction)); - - if (offset + size > PAGE_SIZE) { - addr = BAD_DMA_ADDRESS; - goto done; - } - - addr = (u64) page_address(page); - if (addr) - addr += offset; - /* TODO: handle highmem pages */ - -done: - return addr; -} - -static void qib_dma_unmap_page(struct ib_device *dev, u64 addr, size_t size, - enum dma_data_direction direction) -{ - BUG_ON(!valid_dma_direction(direction)); -} - -static int qib_map_sg(struct ib_device *dev, struct scatterlist *sgl, - int nents, enum dma_data_direction direction) -{ - struct scatterlist *sg; - u64 addr; - int i; - int ret = nents; - - BUG_ON(!valid_dma_direction(direction)); - - for_each_sg(sgl, sg, nents, i) { - addr = (u64) page_address(sg_page(sg)); - /* TODO: handle highmem pages */ - if (!addr) { - ret = 0; - break; - } - sg->dma_address = addr + sg->offset; -#ifdef CONFIG_NEED_SG_DMA_LENGTH - sg->dma_length = sg->length; -#endif - } - return ret; -} - -static void qib_unmap_sg(struct ib_device *dev, - struct scatterlist *sg, int nents, - enum dma_data_direction direction) -{ - BUG_ON(!valid_dma_direction(direction)); -} - -static void qib_sync_single_for_cpu(struct ib_device *dev, u64 addr, - size_t size, enum dma_data_direction dir) -{ -} - -static void qib_sync_single_for_device(struct ib_device *dev, u64 addr, - size_t size, - enum dma_data_direction dir) -{ -} - -static void *qib_dma_alloc_coherent(struct ib_device *dev, size_t size, - u64 *dma_handle, gfp_t flag) -{ - struct page *p; - void *addr = NULL; - - p = alloc_pages(flag, get_order(size)); - if (p) - addr = page_address(p); - if (dma_handle) - *dma_handle = (u64) addr; - return addr; -} - -static void qib_dma_free_coherent(struct ib_device *dev, size_t size, - void *cpu_addr, u64 dma_handle) -{ - free_pages((unsigned long) cpu_addr, get_order(size)); -} - -struct ib_dma_mapping_ops qib_dma_mapping_ops = { - .mapping_error = qib_mapping_error, - .map_single = qib_dma_map_single, - .unmap_single = qib_dma_unmap_single, - .map_page = qib_dma_map_page, - .unmap_page = qib_dma_unmap_page, - .map_sg = qib_map_sg, - .unmap_sg = qib_unmap_sg, - .sync_single_for_cpu = qib_sync_single_for_cpu, - .sync_single_for_device = qib_sync_single_for_device, - .alloc_coherent = qib_dma_alloc_coherent, - .free_coherent = qib_dma_free_coherent -}; diff --git a/drivers/infiniband/hw/qib/qib_keys.c b/drivers/infiniband/hw/qib/qib_keys.c index 2c3c93572c17..8fdf79f8d4e4 100644 --- a/drivers/infiniband/hw/qib/qib_keys.c +++ b/drivers/infiniband/hw/qib/qib_keys.c @@ -158,10 +158,7 @@ int qib_rkey_ok(struct rvt_qp *qp, struct rvt_sge *sge, unsigned n, m; size_t off; - /* - * We use RKEY == zero for kernel virtual addresses - * (see qib_get_dma_mr and qib_dma.c). - */ + /* We use RKEY == zero for kernel virtual addresses */ rcu_read_lock(); if (rkey == 0) { struct rvt_pd *pd = ibpd_to_rvtpd(qp->ibqp.pd); -- 2.11.0