On Wed, Mar 05, 2025 at 06:21:22PM -0800, Bryan Vyhmeister wrote:
> On Wed, Mar 05, 2025 at 06:03:42PM -0800, Bryan Vyhmeister wrote:
> > On Wed, Mar 05, 2025 at 06:36:29PM -0700, Theo de Raadt wrote:
> > > Bryan Vyhmeister <bryan@bsdjournal.net> wrote:
> > > 
> > > Does not need to say NVME
> > > 
> > > That is wasting bytes.  Look at your dmesg to see how it looks.
> > 
> > Good point. Updated diff below. Should I fix all the Samsung IDs that
> > have NVMe on the end?

Here is a diff that removes NVMe from all the Samsung, SanDisk/Western
Digital, and an SMI NVMe. It also includes the SK hynix SSDs this thread
has been about without NVMe. I went ahead and removed the _NVME from a
lot of the same devices since it is redundant on at least most of the
Samsung NVMe devices. I left it on the SM951 since there is an AHCI
version and an NVME version of that device. This should make plenty of
room for the SK hynix entries now that all of these other entries have
been slimmed down.

I updated the diff to reflect the new entries in pcidevs from a little
while ago also.

Bryan


Index: sys/dev/pci/pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
diff -u -p -r1.2098 pcidevs
--- sys/dev/pci/pcidevs	6 Mar 2025 00:59:45 -0000	1.2098
+++ sys/dev/pci/pcidevs	6 Mar 2025 02:40:01 -0000
@@ -9054,25 +9054,25 @@ product SAMSUNG SWL2210P	0xa000	MagicLAN
 product SAMSUNG2 S4LN053X01	0x1600	S4LN053X01
 product SAMSUNG2 XP941		0xa800	XP941
 product SAMSUNG2 SM951_AHCI	0xa801	SM951 AHCI
-product SAMSUNG2 SM951_NVME	0xa802	SM951/PM951 NVMe
-product SAMSUNG2 SM961_NVME	0xa804	SM961/PM961 NVMe
-product SAMSUNG2 SM981_NVME	0xa808	SM981/PM981 NVMe
-product SAMSUNG2 PM991_NVME	0xa809	PM991 NVMe
-product SAMSUNG2 PM9A1_NVME	0xa80a	PM9A1 NVMe
-product SAMSUNG2 PM9B1_NVME	0xa80b	PM9B1 NVMe
-product SAMSUNG2 PM9C1_NVME	0xa80c	PM9C1 NVMe
-product SAMSUNG2 PM9C1A_NVME	0xa80d	PM9C1a NVMe
+product SAMSUNG2 SM951_NVME	0xa802	SM951/PM951
+product SAMSUNG2 SM961		0xa804	SM961/PM961
+product SAMSUNG2 SM981		0xa808	SM981/PM981
+product SAMSUNG2 PM991		0xa809	PM991
+product SAMSUNG2 PM9A1		0xa80a	PM9A1
+product SAMSUNG2 PM9B1		0xa80b	PM9B1
+product SAMSUNG2 PM9C1		0xa80c	PM9C1
+product SAMSUNG2 PM9C1A		0xa80d	PM9C1a
 product SAMSUNG2 NVME_171X	0xa820	NVMe
 product SAMSUNG2 NVME_172X	0xa821	NVMe
 product SAMSUNG2 NVME_172X_A_B	0xa822	NVMe
 
 /* SanDisk (Western Digital) */
-product SANDISK WDSXXXG1X0C	0x5001	WD Black NVMe
-product SANDISK WDSXXXG2X0C	0x5002	WD Black NVMe
+product SANDISK WDSXXXG1X0C	0x5001	WD Black
+product SANDISK WDSXXXG2X0C	0x5002	WD Black
 product SANDISK PCSN520_1	0x5003	PC SN520
 product SANDISK PCSN520_2	0x5004	PC SN520
 product SANDISK PCSN520_3	0x5005	PC SN520
-product SANDISK WDSXXXG3X0C	0x5006	WD Black NVMe
+product SANDISK WDSXXXG3X0C	0x5006	WD Black
 product SANDISK PCSN530		0x5008	PC SN530
 product SANDISK NVME_1		0x5009	NVMe
 product SANDISK SN850		0x5011	SN850
@@ -9276,7 +9276,10 @@ product SIS 966_HDA		0x7502	966 HD Audio
 /* SK hynix products */
 product SKHYNIX BC501		0x1327	BC501
 product SKHYNIX PC601		0x1627	PC601
+product SKHYNIX SHGP31		0x174a	Gold P31
+product SKHYNIX SHPP41		0x1959	Platinum P41
 product SKHYNIX BC901		0x1d59	BC901
+product SKHYNIX PE8000		0x2839	PE8000
 
 /* SMC products */
 product SMC 83C170		0x0005	83C170
@@ -9293,7 +9296,7 @@ product SMI SM810		0x0810	LynxE
 product SMI SM811		0x0811	LynxE+
 product SMI SM820		0x0820	Lynx3D
 product SMI SM910		0x0910	910
-product SMI SM2260		0x2260  SM2260 NVMe
+product SMI SM2260		0x2260  SM2260
 
 /* SMSC products */
 product SMSC VICTORY66_IDE_1	0x9130	Victory66 IDE