From patchwork Fri May 6 18:03:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 9035431 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E11989F1D3 for ; Fri, 6 May 2016 18:09:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DF27200E9 for ; Fri, 6 May 2016 18:09:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9D43201D3 for ; Fri, 6 May 2016 18:09:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758784AbcEFSIr (ORCPT ); Fri, 6 May 2016 14:08:47 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:38374 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932126AbcEFSDu (ORCPT ); Fri, 6 May 2016 14:03:50 -0400 Received: by mail-wm0-f45.google.com with SMTP id g17so89896494wme.1 for ; Fri, 06 May 2016 11:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qUYCm+4DMkuDkJlyv1QAOfItV8FT1AJ9QiGlr/giHC8=; b=Vj1ZVRTWwwsKynBDCSiU8iwv+r9nMXpV0kL+pVLvNSW/qw6dHKZNDqc0y6u4fRPSyq MGcyogZ4OWCpyRaE5XxTLao/TNeu3h0SKh6cF+sWBjxEEIDRZBmiuoUY4OdEiTZHRlkj 8cL4JiC4vAIuL+r2Ya8EGJT0hckZOA91Z5VSk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qUYCm+4DMkuDkJlyv1QAOfItV8FT1AJ9QiGlr/giHC8=; b=iN3kDDXkTTWAIc78zNI7NphIE4c01o0sQkUbcitxWHRcIwNS36XVmnGzmBQKcSfzkg dpo2lSHxh0YGVGXglah7bJdB0APJ8sIZ1EFIbnwxOz9oqMOZXkOo51TdBYmn5FoHiGTg sJWat1JTBf4ftSRSss/VbFrMJLZiVNk5twcsUJPVT1SieP0VRQueOghH0aC/9wLAq6tV 9GkA4h1+m4vT0dyA6089JThcJ00yJatdEOXjc1FlyVW5JoRQKr/jJ/wjs0YVPINEWBiM U2HmLLyuuuyOLrxNhjxT2MYTYNsNagFIQdt3DiNcA+8q2MyEuxkMFtasUupi8qcAZ5bg Ko7w== X-Gm-Message-State: AOPr4FUGaBvYmixtwtcl+8kvLuK+ISBNEMM/xPpDxe6udmNB2TPaR0w8Z/qikiqWhUn72Q== X-Received: by 10.28.56.4 with SMTP id f4mr10521724wma.70.1462557828725; Fri, 06 May 2016 11:03:48 -0700 (PDT) Received: from Macroninja.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id kz1sm16076559wjc.46.2016.05.06.11.03.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 May 2016 11:03:48 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 16/28] lightnvm: refactor set_bb_tbl for accepting ppa list Date: Fri, 6 May 2016 20:03:09 +0200 Message-Id: <1462557801-24974-17-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462557801-24974-1-git-send-email-m@bjorling.me> References: <1462557801-24974-1-git-send-email-m@bjorling.me> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The set_bb_tbl takes struct nvm_rq and only uses its ppa_list and nr_pages internally. Instead, make these two variables explicit. This allows a user to call it without initializing a struct nvm_rq first. Signed-off-by: Matias Bjørling --- drivers/lightnvm/sysblk.c | 2 +- drivers/nvme/host/lightnvm.c | 8 ++++---- include/linux/lightnvm.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/lightnvm/sysblk.c b/drivers/lightnvm/sysblk.c index 737fbc3..b98ca19 100644 --- a/drivers/lightnvm/sysblk.c +++ b/drivers/lightnvm/sysblk.c @@ -280,7 +280,7 @@ static int nvm_set_bb_tbl(struct nvm_dev *dev, struct sysblk_scan *s, int type) nvm_set_rqd_ppalist(dev, &rqd, s->ppas, s->nr_ppas, 1); nvm_generic_to_addr_mode(dev, &rqd); - ret = dev->ops->set_bb_tbl(dev, &rqd, type); + ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_pages, type); nvm_free_rqd_ppalist(dev, &rqd); if (ret) { pr_err("nvm: sysblk failed bb mark\n"); diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 45e3511..d426d95 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -441,8 +441,8 @@ out: return ret; } -static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd, - int type) +static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr *ppas, + int nr_ppas, int type) { struct nvme_ns *ns = nvmdev->q->queuedata; struct nvme_nvm_command c = {}; @@ -450,8 +450,8 @@ static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd, c.set_bb.opcode = nvme_nvm_admin_set_bb_tbl; c.set_bb.nsid = cpu_to_le32(ns->ns_id); - c.set_bb.spba = cpu_to_le64(rqd->ppa_addr.ppa); - c.set_bb.nlb = cpu_to_le16(rqd->nr_pages - 1); + c.set_bb.spba = cpu_to_le64(ppas->ppa); + c.set_bb.nlb = cpu_to_le16(nr_ppas - 1); c.set_bb.value = type; ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c, diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 9ae0b7c..af72ca7 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -45,7 +45,7 @@ typedef int (nvm_id_fn)(struct nvm_dev *, struct nvm_id *); typedef int (nvm_get_l2p_tbl_fn)(struct nvm_dev *, u64, u32, nvm_l2p_update_fn *, void *); typedef int (nvm_op_bb_tbl_fn)(struct nvm_dev *, struct ppa_addr, u8 *); -typedef int (nvm_op_set_bb_fn)(struct nvm_dev *, struct nvm_rq *, int); +typedef int (nvm_op_set_bb_fn)(struct nvm_dev *, struct ppa_addr *, int, int); typedef int (nvm_submit_io_fn)(struct nvm_dev *, struct nvm_rq *); typedef int (nvm_erase_blk_fn)(struct nvm_dev *, struct nvm_rq *); typedef void *(nvm_create_dma_pool_fn)(struct nvm_dev *, char *);