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 2707D280A56; Tue, 27 May 2025 17:12:40 +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=1748365960; cv=none; b=VP48Z+a2KRepxHvpgpaKb4Eii/yA5oWwnmMec8eaJ7IYt9OnIOZtCR9//uXMv5n828FV0YNrJKyZpTRhWdtXPHB2K/vt1nUO5LFgsbYGEecQP9KS2Gb5aw8PjjqU18XAl9UUZcDdaNbCFJrqHOIXNEslo69fPzcYxPJgxlfUKak= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365960; c=relaxed/simple; bh=/LD75UjN4iLFPGsU+2P9ft04A8ywPTScxmh5pp0xfRI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jXd0g1C6dn1zk/tbRkPj1X/Fy2xKihkctaUzGVWkJVslgjPl5hf55nXBm5iy9K8TsSFAHuV6CSof9kgCrF0hwBIvU6MGe+on6CR0+aYAX/fy2GC5e082pd1jtxyJQ+EXnBS7ApSEKVkXHnk1zML1Eoio1ftm6+Fbrni/S142Q1I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p63xSd6X; 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="p63xSd6X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 974E6C4CEE9; Tue, 27 May 2025 17:12:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365960; bh=/LD75UjN4iLFPGsU+2P9ft04A8ywPTScxmh5pp0xfRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p63xSd6X8qhA5YkIrJoEBm3CIskkQxLh6Gl3bMETAk1G2UzfI1C8sSW+pWJ82mdEv LVHuSk7nRqq6QgVcvzFFqky0tpOwksNGTY03JU628QsdIht32LErcVHpnCN0iU9rQi 3AtWZ+3oPi2BFSeQnjUs+/Tt2QAX9a+PQMJK4m7E= 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.12 515/626] nvme-pci: add quirks for device 126f:1001 Date: Tue, 27 May 2025 18:26:48 +0200 Message-ID: <20250527162505.885066816@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-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 265b3608ae26e..f2c06bb96c8d2 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3587,6 +3587,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