Skip to contentSkip to conversation

FAILED: patch "[PATCH] nvme: fix the definition of the doorbell buffer config" failed to apply to 4.12-stable tree

PATCH [email protected] 2 participants 3 messages Sep 4, 2017

Subsystems (2)
Stable branch NVMe
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 223694b9ae8bfba99f3528d49d07a740af6ff95a Mon Sep 17 00:00:00 2001

From: Changpeng Liu <[email protected]>
Date: Thu, 31 Aug 2017 11:22:49 +0800
Subject: [PATCH] nvme: fix the definition of the doorbell buffer config
support bit

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 <[email protected]>
Reviewed-by Sagi Grimberg <[email protected]>
Reviewed-by Max Gurtovoy <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
Fixes f9f38e33 ("nvme: improve performance for virtual NVMe devices")
Cc [email protected]
include/linux/nvme.h +1 -1
index 25d8225dbd04..8efff888bd9b 100644
@@ -254,7 +254,7 @@ enum {
 	NVME_CTRL_VWC_PRESENT			= 1 << 0,
 	NVME_CTRL_OACS_SEC_SUPP                 = 1 << 0,
 	NVME_CTRL_OACS_DIRECTIVES		= 1 << 5,
-	NVME_CTRL_OACS_DBBUF_SUPP		= 1 << 7,
+	NVME_CTRL_OACS_DBBUF_SUPP		= 1 << 8,
 };
 
 struct nvme_lbaf {
Reviewed-by Sagi Grimberg Reviewed-by Max Gurtovoy Reviewed-by
#1 lore raw
Quoted 7 lines · On Mon, Sep 04, 2017 at 12:31:33PM +0200, [email protected] wrote:

The patch below does not apply to the 4.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

Hi Greg,

try this one

--- 8< ---

Quoted 1 line

From c10e7d67283fc37c029ef6072394002a51d3da60 Mon Sep 17 00:00:00 2001

From: Changpeng Liu <[email protected]>
Date: Thu, 31 Aug 2017 11:22:49 +0800
Subject: [PATCH] nvme: fix the definition of the doorbell buffer config
support bit

[ 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 <[email protected]>
Reviewed-by Sagi Grimberg <[email protected]>
Reviewed-by Max Gurtovoy <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
Fixes f9f38e33 ("nvme: improve performance for virtual NVMe devices")
Cc [email protected]
---
 include/linux/nvme.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/nvme.h +1 -1
index b625bacf37ef..f4f9481a0c8a 100644
@@ -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 {
Signature · 10 lines
2.13.5


-- 
Johannes Thumshirn                                          Storage
[email protected]                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N�rnberg
GF: Felix Imend�rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N�rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
author maintainer
#2 lore raw
Quoted 7 lines · Johannes Thumshirn
Quoted 6 lines · On Mon, Sep 04, 2017 at 12:31:33PM +0200, [email protected] wrote:

The patch below does not apply to the 4.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 5 lines
Quoted 1 line

thanks,

Hi Greg,

try this one

Thanks, that worked.

greg k-h