diff options
| author | Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> | 2020-07-17 03:51:37 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-07-29 08:45:18 +0300 |
| commit | 6c3c05b087ada8947cd31895f67e433070446234 (patch) | |
| tree | d6493909e2c496b6b9deb0d038ec42a9ddcb8fe3 /drivers/nvme/host/nvme.h | |
| parent | 5887450b69e72d4b472a7d049773f6a01bc24cd7 (diff) | |
| download | linux-6c3c05b087ada8947cd31895f67e433070446234.tar.xz | |
nvme-core: replace ctrl page size with a macro
Saving the nvme controller's page size was from a time when the driver
tried to use different sized pages, but this value is always set to
a constant, and has been this way for some time. Remove the 'page_size'
field and replace its usage with the constant value.
This also lets the compiler make some micro-optimizations in the io
path, and that's always a good thing.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host/nvme.h')
| -rw-r--r-- | drivers/nvme/host/nvme.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 13ca90bcd352..2ee91a3dd8e0 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -37,6 +37,14 @@ extern unsigned int admin_timeout; #define NVME_INLINE_METADATA_SG_CNT 1 #endif +/* + * Default to a 4K page size, with the intention to update this + * path in the future to accommodate architectures with differing + * kernel and IO page sizes. + */ +#define NVME_CTRL_PAGE_SHIFT 12 +#define NVME_CTRL_PAGE_SIZE (1 << NVME_CTRL_PAGE_SHIFT) + extern struct workqueue_struct *nvme_wq; extern struct workqueue_struct *nvme_reset_wq; extern struct workqueue_struct *nvme_delete_wq; @@ -234,7 +242,6 @@ struct nvme_ctrl { u32 queue_count; u64 cap; - u32 page_size; u32 max_hw_sectors; u32 max_segments; u32 max_integrity_segments; |