From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ED8EC43603 for ; Mon, 16 Dec 2019 18:16:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 416C2207FF for ; Mon, 16 Dec 2019 18:16:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520163; bh=cEZh9YHc/EX4a5v+m12JLY6mEnJM216KP215sTVz/CQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RH1cRa5KLQeVHHt8QJCOLVrkZWtkJm3T1o8IhHy/lu38m8tWWKTYD8Ylzx/RoRN9B d8sWhRT0y6OSkJBlUtYB5h0y06fZE7qB2mOb3qORssS47Yb3crmF/4NgMHWglZq6E9 Uge4oMOhOxESAa+3o5eTRxZMEnrlR3bwM6pgTJrA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730986AbfLPSQC (ORCPT ); Mon, 16 Dec 2019 13:16:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:37956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731447AbfLPSQC (ORCPT ); Mon, 16 Dec 2019 13:16:02 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4A25D206E0; Mon, 16 Dec 2019 18:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520161; bh=cEZh9YHc/EX4a5v+m12JLY6mEnJM216KP215sTVz/CQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uQ48wwmxf7d/hfXKorrkVxighjbaMv5/oL1yk6JeTl6tVnBVeDrB1cptanpOoACQx LwGaJXNgC1tR8UwX0DxxpbpxYjw5QXkTwowbxLJ4KwCFP886OWsfEtP6yaUo0VPcIm I3c1ohq4hqJKympALslmLwV0LygIi7V63/OFND6g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jian-Hong Pan , Bjorn Helgaas , Christoph Hellwig Subject: [PATCH 5.4 004/177] Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T" Date: Mon, 16 Dec 2019 18:47:40 +0100 Message-Id: <20191216174812.052920441@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174811.158424118@linuxfoundation.org> References: <20191216174811.158424118@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jian-Hong Pan commit 655e7aee1f0398602627a485f7dca6c29cc96cae upstream. Since e045fa29e893 ("PCI/MSI: Fix incorrect MSI-X masking on resume") is merged, we can revert the previous quirk now. This reverts commit 19ea025e1d28c629b369c3532a85b3df478cc5c6. Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=204887 Fixes: 19ea025e1d28 ("nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T") Link: https://lore.kernel.org/r/20191031093408.9322-1-jian-hong@endlessm.com Signed-off-by: Jian-Hong Pan Signed-off-by: Bjorn Helgaas Acked-by: Christoph Hellwig Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/core.c | 10 ---------- 1 file changed, 10 deletions(-) --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2406,16 +2406,6 @@ static const struct nvme_core_quirk_entr .vid = 0x14a4, .fr = "22301111", .quirks = NVME_QUIRK_SIMPLE_SUSPEND, - }, - { - /* - * This Kingston E8FK11.T firmware version has no interrupt - * after resume with actions related to suspend to idle - * https://bugzilla.kernel.org/show_bug.cgi?id=204887 - */ - .vid = 0x2646, - .fr = "E8FK11.T", - .quirks = NVME_QUIRK_SIMPLE_SUSPEND, } };