Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp959436pxp; Wed, 16 Mar 2022 22:40:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxky5xbTrkBYAtwR6qiyRe8REztdYSf5BsvHXBy7Tl/kqRC1+vvr4h/QYlbkpYObSzwr3Rp X-Received: by 2002:a05:6a00:c93:b0:4f7:ad05:2f36 with SMTP id a19-20020a056a000c9300b004f7ad052f36mr2956455pfv.41.1647495647673; Wed, 16 Mar 2022 22:40:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647495647; cv=none; d=google.com; s=arc-20160816; b=W+ldsL3RqkKgDwbuuqleDNqRQMpF6hs/IrJLaL1lvtW1+OYaRJCGh4PqBuUdjG62oV HE8jqYat0Y0OEUn6xmKkEH6xm5s8xWj8gPuvhETpIDsRh+WBmxDBeiWIJYRnvwfaWc4R QgrQZlXxLSHB2tiNyukNqQVvZaLX5CSK+wwCAuMcuw7PUqYUZ5OlzvrNaAOyfUs4RgCO J0R/yGZYbEYY6dxk27q1ik/rIZ/LLeZanPDW+kJjsfyt+2CpL1XQnAiLveOG70/sYZkv YXqY5m0Ds6g4ZJ5RfWJwqTDr/Cp8+SyPcLfw6bHrW6Vk5U9+g7NWeDbpHiiqXKH80bfr JyVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=Aj55LV23IrQVnS1JIWgQjYe+OWRDGoTYduCmXbrohUQ=; b=fzUtdPKJIHt0QvKWwZ9IIGBT0E2WhWq320vbHpTtEYxE3k7/9xVtka5FuNCzeDMA9y Qb27wJuwUM7zQ0pQ8a0feo+VIEdCwTYmuOu3UdKLMYRzVMmFxIw4l7esOscEVRp1FRMM 6G7DF1XshTiOZT9sRr23Sw0Ekvu+l5TfCPBCYr4hc11apZyv36JuIohjtQo/eEwGUsH+ 4aUWoRniYO1GSLqoRQDvOEJP40MSTGTTrobfUgPQRZrCJxXk4im79I2AOD0hruyWIEHm qYtS+SajQSbf1P7iEyzCoRlvEgpf+M0TsvBsRPCsRhSPDjNalSzNOpHcOjFCFT1SmKHD rOow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SDnCCwwu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id u5-20020a170902bf4500b001532c4b84a2si3445390pls.57.2022.03.16.22.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 22:40:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SDnCCwwu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id F3C21179B1B; Wed, 16 Mar 2022 21:49:19 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347259AbiCPHxJ (ORCPT + 99 others); Wed, 16 Mar 2022 03:53:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354361AbiCPHxA (ORCPT ); Wed, 16 Mar 2022 03:53:00 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E01DB5D5D3 for ; Wed, 16 Mar 2022 00:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647417106; x=1678953106; h=from:to:cc:subject:date:message-id; bh=vKvbQwYgcjb2VBnqEZFgMX1Gx5eolCjtlW5mckiZ48U=; b=SDnCCwwubVVhayZRPjBTY8Maa7d8MWIpRm9TyolQZ5xPjfUsmgRcROUE J3jAym9vZ2LUJwvjyxGvXmFv3KsWnvpihJzmfo8xsOkqNZTxe9cs2Zz8J aEMLx7KYua1UJ6kkGmhOC65mRwSHkonsmlcD+Y1WOPhNhfl+RaNQIzQZo aC41t7NM2WuvpVJBcyitc+/Oouj25jGJS/qKZcr0xEo2Xy9rA9h/PrYuY SvamuCsmMa+zHYrJgWcS8zTncwxcZ+3WIpAjvVCf9mRt+mgUaYEjQ0LW+ m4cs8j7o864MrgMpBxhH9y5wUnBx+/unhoEirzsXHiREe554TxoEoUoQz A==; X-IronPort-AV: E=McAfee;i="6200,9189,10286"; a="281295414" X-IronPort-AV: E=Sophos;i="5.90,186,1643702400"; d="scan'208";a="281295414" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2022 00:51:46 -0700 X-IronPort-AV: E=Sophos;i="5.90,186,1643702400"; d="scan'208";a="557328291" Received: from basccgtest09.gar.corp.intel.com (HELO localhost.localdomain) ([10.223.165.104]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2022 00:51:23 -0700 From: monish.kumar.r@intel.com To: kbusch@kernel.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Cc: abhijeet.rao@intel.com, monish.kumar.r@intel.com Subject: [PATCH] Revert "Adding quirk changes for Samsung X5 device" Date: Wed, 16 Mar 2022 13:23:12 +0530 Message-Id: <20220316075313.18853-1-monish.kumar.r@intel.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Monish Kumar R This reverts commit 1c1b18c97b441cb1a4eb9c6e95d9c357b687cdd0. --- drivers/nvme/host/pci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index c01cb381c3ff..8bb184a7479c 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3463,10 +3463,14 @@ static const struct pci_device_id nvme_id_table[] = { NVME_QUIRK_128_BYTES_SQES | NVME_QUIRK_SHARED_TAGS | NVME_QUIRK_SKIP_CID_GEN }, +<<<<<<< HEAD { PCI_DEVICE(0x144d, 0xa808), /* Samsung X5 */ .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY| NVME_QUIRK_NO_DEEPEST_PS | NVME_QUIRK_IGNORE_DEV_SUBNQN, }, +======= + +>>>>>>> parent of 1c1b18c97b44... Adding quirk changes for Samsung X5 device { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, { 0, } }; -- 2.17.1