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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D67AC4167B for ; Sun, 29 Oct 2023 23:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbjJ2XSP (ORCPT ); Sun, 29 Oct 2023 19:18:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231818AbjJ2XSE (ORCPT ); Sun, 29 Oct 2023 19:18:04 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE45919151; Sun, 29 Oct 2023 16:07:45 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5FE9C433AD; Sun, 29 Oct 2023 22:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620222; bh=havvXX1A3BkDIs9BfHus35uF0tNKO/3fYel0i7hDJaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BaJ3XRfUAJkLqqJ0kCDiR5yPykXIT7TvqrjAHWkSg7kVuX0eaqPEvDRTghJMzRrzx rxepF6NAU7qOMrRxYBS9nQ0Y0EpzCHJgffHvNoP+wbj/Q5tYgiymkOfBkRne4boVDZ Oky/crIfyKCdqVU38jTG91bai7vaZlZQUo5h64+kLGVx+3pFbvBc8jLO0tomvsoSnN q6PLCknKKavCDJ699Nx6KZy2LVnXTDHMEH/qcJg7y6OIqjC7kB9ptz4u3coyziTbq2 gk09M+a6lTA6DA1Plfd8MGo174YkoC9q+7bkC3zXa1GM7YN/bH1HND8UER4C8SBeaw jwXIOK0CGiQrQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Keith Busch , welsh@cassens.com, Sasha Levin , sagi@grimberg.me, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.5 49/52] nvme-pci: add BOGUS_NID for Intel 0a54 device Date: Sun, 29 Oct 2023 18:53:36 -0400 Message-ID: <20231029225441.789781-49-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225441.789781-1-sashal@kernel.org> References: <20231029225441.789781-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.9 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Keith Busch [ Upstream commit 5c3f4066462a5f6cac04d3dd81c9f551fabbc6c7 ] These ones claim cmic and nmic capable, so need special consideration to ignore their duplicate identifiers. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217981 Reported-by: welsh@cassens.com Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 347cb5daebc3c..3f0c9ee09a12b 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3329,7 +3329,8 @@ static const struct pci_device_id nvme_id_table[] = { { PCI_VDEVICE(INTEL, 0x0a54), /* Intel P4500/P4600 */ .driver_data = NVME_QUIRK_STRIPE_SIZE | NVME_QUIRK_DEALLOCATE_ZEROES | - NVME_QUIRK_IGNORE_DEV_SUBNQN, }, + NVME_QUIRK_IGNORE_DEV_SUBNQN | + NVME_QUIRK_BOGUS_NID, }, { PCI_VDEVICE(INTEL, 0x0a55), /* Dell Express Flash P4600 */ .driver_data = NVME_QUIRK_STRIPE_SIZE | NVME_QUIRK_DEALLOCATE_ZEROES, }, -- 2.42.0