Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3487022pxk; Mon, 5 Oct 2020 10:53:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYhH5bbqokOJWqtDTRPML/cMw6akBHGCS7Edk5pPHwOdHlwTH5kys4TqKwZxs1vkqecvQT X-Received: by 2002:a50:e78f:: with SMTP id b15mr903023edn.104.1601920419365; Mon, 05 Oct 2020 10:53:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601920419; cv=none; d=google.com; s=arc-20160816; b=0USnr/Qwa4l6AShRYr97xvuUH+DWapqaQuAMEHC2WXE1FWxn1auknZpeJLXEPDAinh aimIauhsN9Vx1l00mtK7McLwW8Vsn3Av0NX4qXRJfdN2t+7knOtGs5gbU42t+C8243MH PvRqjhB2fHrYi6qeGh1fr2jSDCtl8soj3OkEFUtuZSYPWDCBM8yTK1zHoxZ/kziWx+er VH8yFW3o+qWUmD/dvORmhDA4jw6Z1OQTmoUhMqClthxf4G2U77iy/JHCbuV6bpwisb/M HsxLP61RynftwhUA9ueqLleAQSiLXopkRH3Z0zRKTnClV+aA5Zs0eJu+ZwXyu525uCIU m6sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fOeDb6E9DBZUhUiAQb1jPhtXfngNYt/MsiyNouP0I3U=; b=UBxrRYekIp4HsSIijehFliKNN06dPd2+9YMGQZQKCVnqzSL12SwfcVj0/cCmeKYa3I EEVjjWMjHcYpUKsUnhWhqw+iuYSclUwA1Oz7fxt9OrT9WGKW18mgbKVyiwVvfZQqY2gS ymsybbp56QDBA9Bw3ZIoMSH4A+WS+fWfh0Nz0y0UbllQVbq0Iu5Z4GJRnvGxYcEW/f29 bdHXl1QRbm7V3d+BT7MJ3C5EJ1gbzk2CxEqTrqz5fQt3/a73/ZPNZ8y/6rzyLqCR0d4k 8oB09ZLu0G5oNXpPcXE5KPL5geOr4JhCxNsfwmHZl9X0E8pQhVf+r3Ski8nbfYxK2Yjk 4ysA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Wsu2sFRx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y2si462583edw.497.2020.10.05.10.53.17; Mon, 05 Oct 2020 10:53:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Wsu2sFRx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728350AbgJEPir (ORCPT + 99 others); Mon, 5 Oct 2020 11:38:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:57542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727816AbgJEPax (ORCPT ); Mon, 5 Oct 2020 11:30:53 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 64F532074F; Mon, 5 Oct 2020 15:30:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911852; bh=hFZ2Cj1jPM+ORT1KbOJS5DWU4Mhjq3+d26+Fw7EeSEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wsu2sFRxVpZN2RfFPmSa4NgpcWT4YLHYBbGtWxebEdNz15Cwr3Qfl7MDzpDZge3Pt FNFa+wjwrAepxh+/pnWWj5sKKMBs/I8Uuulaa2DMDGpIuhMRhNUZS4w9l9FLb1b0DG AFLzkb5TjDlAkQYNRqHSy91tOIISLypeMYp0UEhI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Christoph Hellwig , Damien Le Moal , Keith Busch , Jens Axboe , Revanth Rajashekar Subject: [PATCH 5.4 50/57] nvme: Cleanup and rename nvme_block_nr() Date: Mon, 5 Oct 2020 17:27:02 +0200 Message-Id: <20201005142112.202881686@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142109.796046410@linuxfoundation.org> References: <20201005142109.796046410@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Damien Le Moal commit 314d48dd224897e35ddcaf5a1d7d133b5adddeb7 upstream. Rename nvme_block_nr() to nvme_sect_to_lba() and use SECTOR_SHIFT instead of its hard coded value 9. Also add a comment to decribe this helper. Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Damien Le Moal Signed-off-by: Keith Busch Signed-off-by: Jens Axboe Signed-off-by: Revanth Rajashekar 1 Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/core.c | 6 +++--- drivers/nvme/host/nvme.h | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -630,7 +630,7 @@ static blk_status_t nvme_setup_discard(s } __rq_for_each_bio(bio, req) { - u64 slba = nvme_block_nr(ns, bio->bi_iter.bi_sector); + u64 slba = nvme_sect_to_lba(ns, bio->bi_iter.bi_sector); u32 nlb = bio->bi_iter.bi_size >> ns->lba_shift; if (n < segments) { @@ -671,7 +671,7 @@ static inline blk_status_t nvme_setup_wr cmnd->write_zeroes.opcode = nvme_cmd_write_zeroes; cmnd->write_zeroes.nsid = cpu_to_le32(ns->head->ns_id); cmnd->write_zeroes.slba = - cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req))); + cpu_to_le64(nvme_sect_to_lba(ns, blk_rq_pos(req))); cmnd->write_zeroes.length = cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1); cmnd->write_zeroes.control = 0; @@ -695,7 +695,7 @@ static inline blk_status_t nvme_setup_rw cmnd->rw.opcode = (rq_data_dir(req) ? nvme_cmd_write : nvme_cmd_read); cmnd->rw.nsid = cpu_to_le32(ns->head->ns_id); - cmnd->rw.slba = cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req))); + cmnd->rw.slba = cpu_to_le64(nvme_sect_to_lba(ns, blk_rq_pos(req))); cmnd->rw.length = cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1); if (req_op(req) == REQ_OP_WRITE && ctrl->nr_streams) --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -429,9 +429,12 @@ static inline int nvme_reset_subsystem(s return ctrl->ops->reg_write32(ctrl, NVME_REG_NSSR, 0x4E564D65); } -static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector) +/* + * Convert a 512B sector number to a device logical block number. + */ +static inline u64 nvme_sect_to_lba(struct nvme_ns *ns, sector_t sector) { - return (sector >> (ns->lba_shift - 9)); + return sector >> (ns->lba_shift - SECTOR_SHIFT); } static inline void nvme_end_request(struct request *req, __le16 status,