From: Max Gurtovoy <maxg@mellanox.com>
To: linux-block@vger.kernel.org, axboe@kernel.dk,
martin.petersen@oracle.com, linux-nvme@lists.infradead.org,
keith.busch@intel.com, hch@lst.de, sagi@grimberg.me
Cc: shlomin@mellanox.com, israelr@mellanox.com,
Max Gurtovoy <maxg@mellanox.com>
Subject: [PATCH v4 3/3] nvme: remove PI values definition from NVMe subsystem
Date: Sun, 8 Sep 2019 18:26:45 +0300 [thread overview]
Message-ID: <1567956405-5585-3-git-send-email-maxg@mellanox.com> (raw)
In-Reply-To: <1567956405-5585-1-git-send-email-maxg@mellanox.com>
Use block layer definition instead of re-defining it with the same
values.
Suggested-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
---
changes from v3:
- added Reviewed-by signature
---
drivers/nvme/host/core.c | 12 ++++++------
include/linux/nvme.h | 3 ---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index bdc0a64..a1c0ce0 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -663,11 +663,11 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns,
}
switch (req->rq_disk->protection_type) {
- case NVME_NS_DPS_PI_TYPE3:
+ case T10_PI_TYPE3_PROTECTION:
control |= NVME_RW_PRINFO_PRCHK_GUARD;
break;
- case NVME_NS_DPS_PI_TYPE1:
- case NVME_NS_DPS_PI_TYPE2:
+ case T10_PI_TYPE1_PROTECTION:
+ case T10_PI_TYPE2_PROTECTION:
control |= NVME_RW_PRINFO_PRCHK_GUARD |
NVME_RW_PRINFO_PRCHK_REF;
cmnd->rw.reftag = cpu_to_le32(t10_pi_ref_tag(req));
@@ -1498,13 +1498,13 @@ static void nvme_init_integrity(struct gendisk *disk, u16 ms)
memset(&integrity, 0, sizeof(integrity));
switch (disk->protection_type) {
- case NVME_NS_DPS_PI_TYPE3:
+ case T10_PI_TYPE3_PROTECTION:
integrity.profile = &t10_pi_type3_crc;
integrity.tag_size = sizeof(u16) + sizeof(u32);
integrity.flags |= BLK_INTEGRITY_DEVICE_CAPABLE;
break;
- case NVME_NS_DPS_PI_TYPE1:
- case NVME_NS_DPS_PI_TYPE2:
+ case T10_PI_TYPE1_PROTECTION:
+ case T10_PI_TYPE2_PROTECTION:
integrity.profile = &t10_pi_type1_crc;
integrity.tag_size = sizeof(u16);
integrity.flags |= BLK_INTEGRITY_DEVICE_CAPABLE;
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 01aa6a6..8d45c3e 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -381,9 +381,6 @@ enum {
NVME_NS_DPC_PI_TYPE1 = 1 << 0,
NVME_NS_DPS_PI_FIRST = 1 << 3,
NVME_NS_DPS_PI_MASK = 0x7,
- NVME_NS_DPS_PI_TYPE1 = 1,
- NVME_NS_DPS_PI_TYPE2 = 2,
- NVME_NS_DPS_PI_TYPE3 = 3,
};
struct nvme_ns_id_desc {
--
1.8.3.1
next prev parent reply other threads:[~2019-09-08 15:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-08 15:26 [PATCH v4 1/3] block: centralize PI remapping logic to the block layer Max Gurtovoy
2019-09-08 15:26 ` [PATCH v4 2/3] block: don't remap ref tag for T10 PI type 0 Max Gurtovoy
2019-09-09 2:22 ` Martin K. Petersen
2019-09-09 2:36 ` Keith Busch
2019-09-09 2:49 ` Martin K. Petersen
2019-09-09 13:31 ` Max Gurtovoy
2019-09-08 15:26 ` Max Gurtovoy [this message]
2019-09-09 2:21 ` [PATCH v4 1/3] block: centralize PI remapping logic to the block layer Martin K. Petersen
2019-09-09 13:55 ` Max Gurtovoy
2019-09-10 2:29 ` Martin K. Petersen
2019-09-10 22:27 ` Max Gurtovoy
2019-09-11 1:16 ` Martin K. Petersen
2019-09-11 9:12 ` Max Gurtovoy
2019-09-13 22:20 ` Martin K. Petersen
2019-09-16 8:03 ` Christoph Hellwig
2019-09-16 17:19 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1567956405-5585-3-git-send-email-maxg@mellanox.com \
--to=maxg@mellanox.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=israelr@mellanox.com \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=martin.petersen@oracle.com \
--cc=sagi@grimberg.me \
--cc=shlomin@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).