From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752802AbdLDQnE (ORCPT ); Mon, 4 Dec 2017 11:43:04 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:6552 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751134AbdLDQnA (ORCPT ); Mon, 4 Dec 2017 11:43:00 -0500 X-IronPort-AV: E=Sophos;i="5.45,359,1508774400"; d="scan'208";a="160378155" From: Jeffrey Lien To: Greg Kroah-Hartman , "linux-kernel@vger.kernel.org" CC: "stable@vger.kernel.org" , Christoph Hellwig Subject: RE: [PATCH 4.9 26/38] nvme-pci: add quirk for delay before CHK RDY for WDC SN200 Thread-Topic: [PATCH 4.9 26/38] nvme-pci: add quirk for delay before CHK RDY for WDC SN200 Thread-Index: AQHTbRlF66wVGcZ4oku3Bje8S8Y+fqMzY0pw Date: Mon, 4 Dec 2017 16:42:44 +0000 Message-ID: References: <20171204160007.448534903@linuxfoundation.org> <20171204160008.458694728@linuxfoundation.org> In-Reply-To: <20171204160008.458694728@linuxfoundation.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jeff.Lien@wdc.com; x-originating-ip: [199.255.44.171] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR04MB1018;20:mn517/6LvPTw4pT0LAZD2MLqhC6dfQMEsrlLc4v1FMJcOqcFhJn+xQAsBIylTqvUEfkJO6oxYnqUEL6pEr2FXPkXEYAmhJHIT8W3rFHht9VQk+88dIjhZ6FdHGXas7WaTvDeycmZtWVjvx2HTzOcM+I5nBOOWU39MA38NX8aYkc= x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 5595404d-b74a-4f4d-9ff8-08d53b360b6d x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603286);SRVR:DM5PR04MB1018; x-ms-traffictypediagnostic: DM5PR04MB1018: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(9452136761055); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040450)(2401047)(5005006)(8121501046)(3231022)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(6072148)(201708071742011);SRVR:DM5PR04MB1018;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:DM5PR04MB1018; x-forefront-prvs: 051158ECBB x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(366004)(39860400002)(346002)(376002)(189002)(13464003)(199003)(72206003)(106356001)(6116002)(102836003)(3846002)(105586002)(54356011)(8936002)(25786009)(305945005)(2906002)(7736002)(2900100001)(76176011)(68736007)(7696005)(478600001)(316002)(81166006)(81156014)(8676002)(54906003)(189998001)(53936002)(9686003)(6246003)(101416001)(5660300001)(4326008)(6506006)(74316002)(97736004)(66066001)(99286004)(55016002)(3660700001)(229853002)(2501003)(110136005)(3280700002)(575784001)(86362001)(14454004)(77096006)(53546010)(6436002)(33656002)(2950100002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR04MB1018;H:DM5PR04MB1020.namprd04.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5595404d-b74a-4f4d-9ff8-08d53b360b6d X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Dec 2017 16:42:44.6612 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB1018 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by nfs id vB4Gh99O026665 I have no objections to adding this to 4.9-stable or 4.14-stable. Jeff Lien -----Original Message----- From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org] Sent: Monday, December 4, 2017 10:00 AM To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman; stable@vger.kernel.org; Jeffrey Lien; Christoph Hellwig Subject: [PATCH 4.9 26/38] nvme-pci: add quirk for delay before CHK RDY for WDC SN200 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Lien commit 8c97eeccf0ad8783c057830119467b877bdfced7 upstream. And increase the existing delay to cover this device as well. Signed-off-by: Jeff Lien Signed-off-by: Christoph Hellwig Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/nvme.h | 2 +- drivers/nvme/host/pci.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -84,7 +84,7 @@ enum nvme_quirks { * NVME_QUIRK_DELAY_BEFORE_CHK_RDY quirk enabled. The value (in ms) was * found empirically. */ -#define NVME_QUIRK_DELAY_AMOUNT 2000 +#define NVME_QUIRK_DELAY_AMOUNT 2300 enum nvme_ctrl_state { NVME_CTRL_NEW, --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2109,6 +2109,8 @@ static const struct pci_device_id nvme_i .driver_data = NVME_QUIRK_IDENTIFY_CNS, }, { PCI_DEVICE(0x1c58, 0x0003), /* HGST adapter */ .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, }, + { PCI_DEVICE(0x1c58, 0x0023), /* WDC SN200 adapter */ + .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, }, { PCI_DEVICE(0x1c5f, 0x0540), /* Memblaze Pblaze4 adapter */ .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, }, { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },