On Mon, Feb 08, 2021 at 10:48:26AM +0100, Sven Wolf wrote: > Hi, > > thanks for your fast response. > I've chosen "AMD 17_3X_IOMMU" instead of "Starship/Matisse" because in my > point of view, also the other Ryzen Zen 2 pci devices were named 17_3x (e.g. > PCI_PRODUCT_AMD_17_3X_RC 0x1480 /* 17h/3xh Root Complex */)
family 17h model 31h is used by zen 2 based epyc 'rome' and family 17h model 71h is used by zen 2 based desktop ryzen 'matisse' As you have a 17_7X I'd go with using that and not specifying the model in the string. > > Maybe I'm wrong, but we should choose the same descriptions for all of the > Ryzen/Zen devices. We should take the code name e.g. Starship/Matisse or we > should take the vendor codes e.g. 17h/3x > (http://developer.amd.com/wp-content/resources/56323-PUB_0.74.pdf) but we > should not mix them. > > Regarding to the NAVI10 entry. In my case its an RX5700. > For me it's not clear, when we choose the architecture name and when we > choose the product name in the pcidevs :( > I find both of them in the pcidevs > E.g. > define PCI_PRODUCT_ATI_RADEON_HD7990 0x679b /* Radeon HD 7990 */ > define PCI_PRODUCT_ATI_TAHITI_5 0x679f /* Tahiti */ A product name is preferred but the product names often need another number like revision id to be identified. see the table in https://gitlab.freedesktop.org/mesa/drm/-/blob/master/data/amdgpu.ids /usr/X11R6/share/libdrm/amdgpu.ids For example 0x731f 731F, C0, AMD Radeon RX 5700 XT 50th Anniversary 731F, C1, AMD Radeon RX 5700 XT 731F, C2, AMD Radeon RX 5600M 731F, C3, AMD Radeon RX 5700M 731F, C4, AMD Radeon RX 5700 731F, C5, AMD Radeon RX 5700 XT 731F, CA, AMD Radeon RX 5600 XT 731F, CB, AMD Radeon RX 5600 OEM and generally these names aren't known till sometime after the codenames are known. Recently AMD have started doing codenames for codenames, for example Sienna_Cichlid for Navi 21. how about this? Index: pcidevs =================================================================== RCS file: /cvs/src/sys/dev/pci/pcidevs,v retrieving revision 1.1955 diff -u -p -r1.1955 pcidevs --- pcidevs 14 Feb 2021 17:20:47 -0000 1.1955 +++ pcidevs 16 Feb 2021 05:14:35 -0000 @@ -346,6 +346,7 @@ vendor AMPERE 0x1def Ampere vendor SSSTC 0x1e95 SSSTC vendor TEHUTI 0x1fc9 Tehuti Networks vendor SUNIX2 0x1fd4 Sunix +vendor KINGSTON 0x2646 Kingston vendor HINT 0x3388 Hint vendor 3DLABS 0x3d3d 3D Labs vendor AVANCE2 0x4005 Avance Logic @@ -722,6 +723,14 @@ product AMD 15_3X_PCIE_1 0x1424 15h PCIE product AMD 15_3X_PCIE_2 0x1425 15h PCIE product AMD 15_3X_PCIE_3 0x1426 15h PCIE product AMD 16_PCIE 0x1439 16h PCIE +product AMD 17_7X_DF_1 0x1440 17h Data Fabric +product AMD 17_7X_DF_2 0x1441 17h Data Fabric +product AMD 17_7X_DF_3 0x1442 17h Data Fabric +product AMD 17_7X_DF_4 0x1443 17h Data Fabric +product AMD 17_7X_DF_5 0x1444 17h Data Fabric +product AMD 17_7X_DF_6 0x1445 17h Data Fabric +product AMD 17_7X_DF_7 0x1446 17h Data Fabric +product AMD 17_7X_DF_8 0x1447 17h Data Fabric product AMD 17_6X_DF_0 0x1448 17h/6xh Data Fabric product AMD 17_6X_DF_1 0x1449 17h/6xh Data Fabric product AMD 17_6X_DF_2 0x144a 17h/6xh Data Fabric @@ -750,9 +759,14 @@ product AMD 17_DF_8 0x1467 17h Data Fab product AMD 17_CCP_2 0x1468 17h Crypto product AMD 17_PCIE_4 0x1470 17h PCIE product AMD 17_PCIE_5 0x1471 17h PCIE -product AMD 17_3X_RC 0x1480 17h/3xh Root Complex -product AMD 17_3X_CCP 0x1486 17h/3xh Crypto -product AMD 17_3X_HDA 0x1487 17h/3xh HD Audio +product AMD 17_3X_RC 0x1480 17h Root Complex +product AMD 17_7X_IOMMU 0x1481 17h IOMMU +product AMD 17_7X_HB 0x1482 17h Host +product AMD 17_7X_PCIE_1 0x1483 17h PCIE +product AMD 17_7X_PCIE_2 0x1484 17h PCIE +product AMD 17_3X_CCP 0x1486 17h Crypto +product AMD 17_3X_HDA 0x1487 17h HD Audio +product AMD 17_7X_XHCI 0x149c 17h xHCI product AMD 14_HB 0x1510 14h Host product AMD 14_PCIE_1 0x1512 14h PCIE product AMD 14_PCIE_2 0x1513 14h PCIE @@ -861,6 +875,10 @@ product AMD 400SERIES_PCIE_1 0x43c6 400 product AMD 400SERIES_PCIE_2 0x43c7 400 Series PCIE product AMD 400SERIES_AHCI 0x43c8 400 Series AHCI product AMD 400SERIES_XHCI 0x43d0 400 Series xHCI +product AMD 500SERIES_PCIE_1 0x43e9 500 Series PCIE +product AMD 500SERIES_PCIE_2 0x43ea 500 Series PCIE +product AMD 500SERIES_AHCI 0x43eb 500 Series AHCI +product AMD 500SERIES_XHCI 0x43ee 500 Series xHCI /* http://www.amd.com/products/cpg/athlon/techdocs/pdf/21910.pdf */ product AMD SC751_SC 0x7006 751 System product AMD SC751_PPB 0x7007 751 @@ -1151,6 +1169,8 @@ product ATI KAVERI_19 0x1318 Kaveri Rad product ATI KAVERI_20 0x131b Kaveri Radeon R4 product ATI KAVERI_21 0x131c Kaveri Radeon R7 product ATI KAVERI_22 0x131d Kaveri Radeon R6 +product ATI NAVI10_PPB_1 0x1478 Navi 10 PCIE +product ATI NAVI10_PPB_2 0x1479 Navi 10 PCIE product ATI PICASSO 0x15d8 Picasso product ATI RAVEN_VEGA 0x15dd Radeon Vega product ATI RAVEN_VEGA_HDA 0x15de Radeon Vega HD Audio @@ -2202,6 +2222,7 @@ product ATI RADEON_HD6400_HDA 0xaa98 Rad product ATI RADEON_HD7700_HDA 0xaab0 Radeon HD 7700 Audio product ATI RADEON_PRO_HDA 0xaae0 Radeon Pro Audio product ATI VEGA10_HDA_1 0xaaf8 Radeon Rx Vega HD Audio +product ATI NAVI10_HDA_1 0xab38 Navi 10 HD Audio product ATI RS100_AGP 0xcab0 RS100 AGP product ATI RS200_AGP 0xcab2 RS200 AGP product ATI RS250_AGP 0xcab3 RS250 AGP @@ -6192,6 +6213,9 @@ product JMICRON SD_2 0x2391 SD Host Con product JMICRON SDMMC_2 0x2392 SD/MMC product JMICRON MS_2 0x2393 Memory Stick product JMICRON XD_2 0x2394 xD + +/* Kingston */ +product KINGSTON A2000 0x2263 A2000 /* KTI */ product KTI KTIE 0x3000 KTI
