From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E98722566; Tue, 27 May 2025 17:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748368283; cv=none; b=h/S8VmBxygyWpBo1kcrC4w3cuUdFnF7Gp5yBaR0TYPT3ovpRVFZs7zAKbkF5/ahx/RQpyygOOD94b0v9JeZImcnS9vut6Ro1SY5ByxHAzyYxsOJrIHxJQQhOqUV5hKFxUNNcjcrqJhkaC7H9TMmHsB+W7Z3tIFE754v5VBPXD5o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748368283; c=relaxed/simple; bh=kn87KF66COQ/S8ThTxre4ol7GQqz7LDlyOPpx7B/OV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WlHmN/yfCGG7fNwKGZD14RC4o2xL7bGcqUNrvD0y7lXX9MACr2uZAw5RPY6V1pT1sImsNhEiBxVOlfDWwmBABG2f7nYu382klwF5k2XrJfAVmKFdnvMxk/YvwpwUKg3Tyafk6TeWeFGt7RaIUoA8KbPal3O/yGTjrNn0j+NvJRs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=maXiKZ19; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="maXiKZ19" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 743A6C4CEE9; Tue, 27 May 2025 17:51:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748368282; bh=kn87KF66COQ/S8ThTxre4ol7GQqz7LDlyOPpx7B/OV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=maXiKZ19Ladr+Pv/LfKShfxkxGQ4kgDHtSN0whYA3LkhBL+2CGhxFMrPYuVgRh1zw L1Yz1lIM594iOI+KisdGFoODoVumpg0B2ZFQiIbATg+JcK2dTU8Q3wgq1WDaypn9Ob Vokgjq8+t4dHlt5A4xEObHQjaEq5ITTeorhd8ppI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wentao Guan , WangYuli , Sagi Grimberg , Christoph Hellwig , Sasha Levin Subject: [PATCH 6.14 658/783] nvme-pci: add quirks for device 126f:1001 Date: Tue, 27 May 2025 18:27:35 +0200 Message-ID: <20250527162539.924023801@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wentao Guan [ Upstream commit 5b960f92ac3e5b4d7f60a506a6b6735eead1da01 ] This commit adds NVME_QUIRK_NO_DEEPEST_PS and NVME_QUIRK_BOGUS_NID for device [126f:1001]. It is similar to commit e89086c43f05 ("drivers/nvme: Add quirks for device 126f:2262") Diff is according the dmesg, use NVME_QUIRK_IGNORE_DEV_SUBNQN. dmesg | grep -i nvme0: nvme nvme0: pci function 0000:01:00.0 nvme nvme0: missing or invalid SUBNQN field. nvme nvme0: 12/0/0 default/read/poll queues Link:https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e89086c43f0500bc7c4ce225495b73b8ce234c1f Signed-off-by: Wentao Guan Signed-off-by: WangYuli Reviewed-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 00bd21b5c641e..63b03a5a5b765 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3628,6 +3628,9 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1217, 0x8760), /* O2 Micro 64GB Steam Deck */ .driver_data = NVME_QUIRK_DMAPOOL_ALIGN_512, }, + { PCI_DEVICE(0x126f, 0x1001), /* Silicon Motion generic */ + .driver_data = NVME_QUIRK_NO_DEEPEST_PS | + NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(0x126f, 0x2262), /* Silicon Motion generic */ .driver_data = NVME_QUIRK_NO_DEEPEST_PS | NVME_QUIRK_BOGUS_NID, }, -- 2.39.5