From 40f74758ab460cf34bea3d66529c5e625d89fd4f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Sep 2017 13:05:03 +0200 Subject: [PATCH] 4.12-stable patches added patches: nvme-fix-the-definition-of-the-doorbell-buffer-config-support-bit.patch --- ...e-doorbell-buffer-config-support-bit.patch | 37 +++++++++++++++++++ queue-4.12/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.12/nvme-fix-the-definition-of-the-doorbell-buffer-config-support-bit.patch diff --git a/queue-4.12/nvme-fix-the-definition-of-the-doorbell-buffer-config-support-bit.patch b/queue-4.12/nvme-fix-the-definition-of-the-doorbell-buffer-config-support-bit.patch new file mode 100644 index 00000000000..d0ec74d590b --- /dev/null +++ b/queue-4.12/nvme-fix-the-definition-of-the-doorbell-buffer-config-support-bit.patch @@ -0,0 +1,37 @@ +From 223694b9ae8bfba99f3528d49d07a740af6ff95a Mon Sep 17 00:00:00 2001 +From: Changpeng Liu +Date: Thu, 31 Aug 2017 11:22:49 +0800 +Subject: nvme: fix the definition of the doorbell buffer config support bit + +From: Changpeng Liu + +commit 223694b9ae8bfba99f3528d49d07a740af6ff95a upstream. + +NVMe 1.3 specification defines the Optional Admin Command Support feature +flags, bit 8 set to '1' then the controller supports the Doorbell Buffer +Config command. Bit 7 is used for Virtualization Mangement command. + +Signed-off-by: Changpeng Liu +Reviewed-by: Sagi Grimberg +Reviewed-by: Max Gurtovoy +Reviewed-by: Johannes Thumshirn +Signed-off-by: Christoph Hellwig +Fixes: f9f38e33 ("nvme: improve performance for virtual NVMe devices") +Signed-off-by: Greg Kroah-Hartman + + +--- + include/linux/nvme.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/nvme.h ++++ b/include/linux/nvme.h +@@ -245,7 +245,7 @@ enum { + NVME_CTRL_ONCS_WRITE_ZEROES = 1 << 3, + NVME_CTRL_VWC_PRESENT = 1 << 0, + NVME_CTRL_OACS_SEC_SUPP = 1 << 0, +- NVME_CTRL_OACS_DBBUF_SUPP = 1 << 7, ++ NVME_CTRL_OACS_DBBUF_SUPP = 1 << 8, + }; + + struct nvme_lbaf { diff --git a/queue-4.12/series b/queue-4.12/series index 6e9e3f3440f..fa189c23824 100644 --- a/queue-4.12/series +++ b/queue-4.12/series @@ -22,3 +22,4 @@ mmc-sdhci-xenon-add-set_power-callback.patch lib-mpi-kunmap-after-finishing-accessing-buffer.patch xfrm-policy-check-policy-direction-value.patch drm-ttm-fix-accounting-error-when-fail-to-get-pages-for-pool.patch +nvme-fix-the-definition-of-the-doorbell-buffer-config-support-bit.patch -- 2.47.3