On 2022-09-07 17:45, Jonathan Gray wrote:
so the subclass shows as "Audio" not "HD Audio"
in pcidump -v?

 7:0:1: ATI Renoir HD Audio
        0x0000: Vendor ID: 1002, Product ID: 1637
        0x0004: Command: 0006, Status: 0010
        0x0008: Class: 04 Multimedia, Subclass: 03 HD Audio,
                Interface: 00, Revision: 0


Subclass is "Audio":

0:31:3: Intel 600 Series HD Audio
        0x0000: Vendor ID: 8086, Product ID: 51c8
        0x0004: Command: 0006, Status: 0010
        0x0008: Class: 04 Multimedia, Subclass: 01 Audio,
                Interface: 00, Revision: 01
        0x000c: BIST: 00, Header Type: 00, Latency Timer: 20,
                Cache Line Size: 10
        0x0010: BAR mem 64bit addr: 0x000000601e1c8000/0x00004000
        0x0018: BAR empty (00000000)
        0x001c: BAR empty (00000000)
        0x0020: BAR mem 64bit addr: 0x000000601e000000/0x00100000
        0x0028: Cardbus CIS: 00000000
        0x002c: Subsystem Vendor ID: 103c Product ID: 891c
        0x0030: Expansion ROM Base Address: 00000000
        0x0038: 00000000
        0x003c: Interrupt Pin: 01 Line: ff Min Gnt: 00 Max Lat: 00
        0x0050: Capability 0x01: Power Management
                State: D0
        0x0080: Capability 0x09: Vendor Specific
        0x0060: Capability 0x05: Message Signalled Interrupts (MSI)
                Enabled: yes

-Neel

On 2022-09-07 17:12, Jonathan Gray wrote:
> Some of these are Raptor Lake not Alder Lake.
> Do you have a machine with any of the added ids?
>
> The match table is added to when we find machines with an
> unexpected subclass.
>
> On Wed, Sep 07, 2022 at 04:35:32PM -0700, Neel Chauhan wrote:
> > Index: dev/pci/azalia.c
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/pci/azalia.c,v
> > retrieving revision 1.275
> > diff -u -p -u -p -r1.275 azalia.c
> > --- dev/pci/azalia.c  24 Aug 2022 11:21:12 -0000      1.275
> > +++ dev/pci/azalia.c  7 Sep 2022 23:27:07 -0000
> > @@ -473,7 +473,13 @@ azalia_configure_pci(azalia_t *az)
> >       case PCI_PRODUCT_INTEL_500SERIES_HDA_2:
> >       case PCI_PRODUCT_INTEL_500SERIES_LP_HDA:
> >       case PCI_PRODUCT_INTEL_600SERIES_HDA:
> > -     case PCI_PRODUCT_INTEL_600SERIES_LP_HDA:
> > +     case PCI_PRODUCT_INTEL_600SERIES_LP_HDA_0:
> > +     case PCI_PRODUCT_INTEL_600SERIES_LP_HDA_1:
> > +     case PCI_PRODUCT_INTEL_600SERIES_LP_HDA_2:
> > +     case PCI_PRODUCT_INTEL_600SERIES_LP_HDA_3:
> > +     case PCI_PRODUCT_INTEL_600SERIES_LP_HDA_4:
> > +     case PCI_PRODUCT_INTEL_600SERIES_LP_HDA_5:
> > +     case PCI_PRODUCT_INTEL_600SERIES_N_HDA:
> >       case PCI_PRODUCT_INTEL_C600_HDA:
> >       case PCI_PRODUCT_INTEL_C610_HDA_1:
> >       case PCI_PRODUCT_INTEL_C610_HDA_2:
> > @@ -500,6 +506,14 @@ const struct pci_matchid azalia_pci_devi
> >       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_400SERIES_CAVS },
> >       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_400SERIES_LP_HDA },
> >       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_LP_HDA },
> > +     { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_HDA },
> > +     { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_0 },
> > +     { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_1 },
> > +     { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_2 },
> > +     { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_3 },
> > +     { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_4 },
> > +     { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_5 },
> > +     { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_N_HDA },
> >       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_HDA },
> >       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_HDA },
> >  };
> > Index: dev/pci/pcidevs
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/pci/pcidevs,v
> > retrieving revision 1.2004
> > diff -u -p -u -p -r1.2004 pcidevs
> > --- dev/pci/pcidevs   2 Sep 2022 10:34:07 -0000       1.2004
> > +++ dev/pci/pcidevs   7 Sep 2022 23:27:07 -0000
> > @@ -5659,7 +5659,12 @@ product INTEL 600SERIES_LP_PCIE_8      0x51bf
> >  product INTEL 600SERIES_LP_I2C_0     0x51c5  600 Series I2C
> >  product INTEL 600SERIES_LP_I2C_1     0x51c6  600 Series I2C
> >  product INTEL 600SERIES_LP_UART_2    0x51c7  600 Series UART
> > -product INTEL 600SERIES_LP_HDA       0x51c8  600 Series HD Audio
> > +product INTEL 600SERIES_LP_HDA_0     0x51c8  600 Series HD Audio
> > +product INTEL 600SERIES_LP_HDA_1     0x51c9  600 Series HD Audio
> > +product INTEL 600SERIES_LP_HDA_2     0x51ca  600 Series HD Audio
> > +product INTEL 600SERIES_LP_HDA_3     0x51cb  600 Series HD Audio
> > +product INTEL 600SERIES_LP_HDA_4     0x51cc  600 Series HD Audio
> > +product INTEL 600SERIES_LP_HDA_5     0x51cd  600 Series HD Audio
> >  product INTEL 600SERIES_LP_THC_0     0x51d0  600 Series THC
> >  product INTEL 600SERIES_LP_THC_1     0x51d1  600 Series THC
> >  product INTEL 600SERIES_LP_AHCI      0x51d3  600 Series AHCI
> > @@ -5686,6 +5691,7 @@ product INTEL 600SERIES_LP_ISH  0x51fc  60
> >  product INTEL 600SERIES_LP_UFS       0x51ff  600 Series UFS
> >  product INTEL 80960RD                0x5200  i960 RD
> >  product INTEL PRO_100_SERVER 0x5201  PRO 100 Server
> > +product INTEL 600SERIES_N_HDA        0x54c8  600 Series HD Audio
> >  product INTEL WL_22500_16    0x54f0  Wi-Fi 6 AX211
> >  product INTEL I225_LMVP              0x5502  I225-LMvP
> >  product INTEL I226_K         0x5504  I226-K
> > Index: dev/pci/pcidevs.h
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/pci/pcidevs.h,v
> > retrieving revision 1.1998
> > diff -u -p -u -p -r1.1998 pcidevs.h
> > --- dev/pci/pcidevs.h 2 Sep 2022 10:34:43 -0000       1.1998
> > +++ dev/pci/pcidevs.h 7 Sep 2022 23:27:08 -0000
> > @@ -5664,7 +5664,12 @@
> >  #define      PCI_PRODUCT_INTEL_600SERIES_LP_I2C_0    0x51c5          /* 
600 Series
> > I2C */
> >  #define      PCI_PRODUCT_INTEL_600SERIES_LP_I2C_1    0x51c6          /* 
600 Series
> > I2C */
> >  #define      PCI_PRODUCT_INTEL_600SERIES_LP_UART_2   0x51c7          /* 
600 Series
> > UART */
> > -#define      PCI_PRODUCT_INTEL_600SERIES_LP_HDA      0x51c8          /* 
600 Series HD
> > Audio
> > */
> > +#define      PCI_PRODUCT_INTEL_600SERIES_LP_HDA_0    0x51c8          /* 
600 Series
> > HD Audio
> > */
> > +#define      PCI_PRODUCT_INTEL_600SERIES_LP_HDA_1    0x51c9          /* 
600 Series
> > HD Audio
> > */
> > +#define      PCI_PRODUCT_INTEL_600SERIES_LP_HDA_2    0x51ca          /* 
600 Series
> > HD Audio
> > */
> > +#define      PCI_PRODUCT_INTEL_600SERIES_LP_HDA_3    0x51cb          /* 
600 Series
> > HD Audio
> > */
> > +#define      PCI_PRODUCT_INTEL_600SERIES_LP_HDA_4    0x51cc          /* 
600 Series
> > HD Audio
> > */
> > +#define      PCI_PRODUCT_INTEL_600SERIES_LP_HDA_5    0x51cd          /* 
600 Series
> > HD Audio
> > */
> >  #define      PCI_PRODUCT_INTEL_600SERIES_LP_THC_0    0x51d0          /* 
600 Series
> > THC */
> >  #define      PCI_PRODUCT_INTEL_600SERIES_LP_THC_1    0x51d1          /* 
600 Series
> > THC */
> >  #define      PCI_PRODUCT_INTEL_600SERIES_LP_AHCI     0x51d3          /* 
600 Series
> > AHCI */
> > @@ -5691,6 +5696,7 @@
> >  #define      PCI_PRODUCT_INTEL_600SERIES_LP_UFS      0x51ff          /* 
600 Series
> > UFS */
> >  #define      PCI_PRODUCT_INTEL_80960RD       0x5200          /* i960 RD */
> >  #define      PCI_PRODUCT_INTEL_PRO_100_SERVER        0x5201          /* 
PRO 100 Server */
> > +#define      PCI_PRODUCT_INTEL_600SERIES_N_HDA       0x54c8          /* 
600 Series HD
> > Audio */
> >  #define      PCI_PRODUCT_INTEL_WL_22500_16   0x54f0          /* Wi-Fi 6 
AX211 */
> >  #define      PCI_PRODUCT_INTEL_I225_LMVP     0x5502          /* I225-LMvP 
*/
> >  #define      PCI_PRODUCT_INTEL_I226_K        0x5504          /* I226-K */
> > Index: dev/pci/pcidevs_data.h
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/pci/pcidevs_data.h,v
> > retrieving revision 1.1993
> > diff -u -p -u -p -r1.1993 pcidevs_data.h
> > --- dev/pci/pcidevs_data.h    2 Sep 2022 10:34:43 -0000       1.1993
> > +++ dev/pci/pcidevs_data.h    7 Sep 2022 23:27:09 -0000
> > @@ -20032,7 +20032,31 @@ static const struct pci_known_product pc
> >           "600 Series UART",
> >       },
> >       {
> > -         PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA,
> > +         PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_0,
> > +         "600 Series HD Audio",
> > +     },
> > +     {
> > +         PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_1,
> > +         "600 Series HD Audio",
> > +     },
> > +     {
> > +         PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_2,
> > +         "600 Series HD Audio"cd /sys/arch/$(machine)/compile/GENERIC.MP,
> > +     },
> > +     {
> > +         PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_3,
> > +         "600 Series HD Audio",
> > +     },
> > +     {
> > +         PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_4,
> > +         "600 Series HD Audio",
> > +     },
> > +     {
> > +         PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_LP_HDA_5,
> > +         "600 Series HD Audio",
> > +     },
> > +     {
> > +         PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_N_HDA,
> >           "600 Series HD Audio",
> >       },
> >       {
> >
> >



Reply via email to