From patchwork Tue May 3 15:22:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102391 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp655183qge; Tue, 3 May 2016 08:23:31 -0700 (PDT) X-Received: by 10.98.55.133 with SMTP id e127mr4269014pfa.81.1462289011381; Tue, 03 May 2016 08:23:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o1si4821108pfa.151.2016.05.03.08.23.31; Tue, 03 May 2016 08:23:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756160AbcECPX3 (ORCPT + 29 others); Tue, 3 May 2016 11:23:29 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:51867 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755316AbcECPX2 (ORCPT ); Tue, 3 May 2016 11:23:28 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0Mewsn-1bHe7O1cNt-00OYT7; Tue, 03 May 2016 17:22:51 +0200 From: Arnd Bergmann To: Keith Busch , Jens Axboe Cc: =?utf-8?q?Javier_Gonz=C3=A1lez?= , Arnd Bergmann , =?utf-8?q?Matias_Bj=C3=B8rling?= , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] lightnvm: pass dma address to hardware rather than pointer Date: Tue, 3 May 2016 17:22:36 +0200 Message-Id: <1462288968-763853-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:sP9c0OhXpvxP0i0MXKJkbJm07kpY2XZD8GhpGW9klCjHL6T6f7w VCBBdXnMmhHg86spV2F1FxlbIDFEEggAUri/vT/tJgADjbAAzIouDOfu7J+31QLOnzfw7vy KnP2i086pg+Ogp1HOUcMEqPBbfr50M4pX6m5qL/559ItyVfn1rU/y1DMpTKKe40hwwgK9Sf RPTBSbPJE5qS3t0k9DoqA== X-UI-Out-Filterresults: notjunk:1; V01:K0:0LKiuThD+EE=:2jJOCrzsjIvNiIx/caoewE lo6k0YRn4kN1qjsLibN1FKK0XHUqwPWgdfygCC5q2TmsbfsPQWNaPZzAHKDe3+39rVGYTSJ7R Qf1dHCHO+x8EpBSmYE2hfDt/JzTWzf7N3lmyhJ3VSYC/YrzqTBi8hMnuFpA8jNwUyf/Q4JnE2 WF5DFceiSSmJHOBSQLuldlV+UZ2zwra3SwY6EQXyH4Vl2Rh15LRYLkiMD545/eReY5m1f4Mw8 GKuis6xAMixJYXwrRiSsxU/F8kurV6Um1MGaG6oWRRn4cjd3MKH02IKaMX1gcDWgv2EwBOG6+ ssEUMR2+zwDABKHqh8E9g0bKqhn1vwWhQ03tZlospAQguvsrdu+12urW9dQ29lYbcc3Qazxpu fRnA6wne8a0XrsPPEB9aSv6Am5MaIX/93iT1Di+S7bQfcYQ8kSAoFL/A1GrR6a0K5aTKnEH2s INwAW7WWcWLY/Ajl478khQGnKenwzmM9MQ4ynUkQ7ZWJk0LIDHHyV3VDCAucId3udN0KkKq8W 65L6xPUPddm/hHL4SB8gBjnAMB5DUnFDDfVyUqwI7I5r9pSuUyqouUkcX0R84G7DfqJZDZ7TQ /LVXVRTK4+5GTQJktJLSGFD0Wz1Lz9n9qFGBEr89QiDYr+LAd+6uNbyYGiwYp/cd24fwF530X pXvbeJJVpmXADiZMtKD5c6uOZIAcnyNxxEKY+LTC8NmZW0+uu//xhhEay6MpirTelTdA= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent change to lightnvm added code to pass a kernel pointer to the hardware, which gcc complained about: drivers/nvme/host/lightnvm.c: In function 'nvme_nvm_rqtocmd': drivers/nvme/host/lightnvm.c:472:32: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] c->ph_rw.metadata = cpu_to_le64(rqd->meta_list); It looks like this has no way of working anyway, so this changes the code to pass the dma_address instead. This was most likely what was intended here. Neither of the two are currently ever written to, so the effect is the same for now. Signed-off-by: Arnd Bergmann Fixes: a34b1eb78e21 ("lightnvm: enable metadata to be sent to device") --- drivers/nvme/host/lightnvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index fadeb54bc7df..65de1e56e59a 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -469,7 +469,7 @@ static inline void nvme_nvm_rqtocmd(struct request *rq, struct nvm_rq *rqd, c->ph_rw.opcode = rqd->opcode; c->ph_rw.nsid = cpu_to_le32(ns->ns_id); c->ph_rw.spba = cpu_to_le64(rqd->ppa_addr.ppa); - c->ph_rw.metadata = cpu_to_le64(rqd->meta_list); + c->ph_rw.metadata = cpu_to_le64(rqd->dma_meta_list); c->ph_rw.control = cpu_to_le16(rqd->flags); c->ph_rw.length = cpu_to_le16(rqd->nr_pages - 1);