GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include/device/pci_ids,soc/amd/common/block/lpc: drop duplicate PCI IDs 

PCI_DEVICE_ID_AMD_FAM17H_LPC and PCI_DEVICE_ID_AMD_FAM17H_SMBUS redefine
the same values that are already defined by PCI_DEVICE_ID_AMD_CZ_LPC and
PCI_DEVICE_ID_AMD_CZ_SMBUS, so drop PCI_DEVICE_ID_AMD_FAM17H_LPC and
PCI_DEVICE_ID_AMD_FAM17H_SMBUS. Also add some comments to the places in
the code where the defines are used to clarify which ID is used on which
hardware generation.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Id0b3d7b5a886ccc76d82ada6be4145e85fd51ede
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58696
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jason Glenesk <jason.glenesk@gmail.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Felix Held 2021-10-27 18:31:16 +02:00
parent 0d7e2a461a
commit 43cf27d3a7
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/device/pci_ids.h
View File

@ -620,8 +620,6 @@
#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0 0x7916 #define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0 0x7916
#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1 0x7917 #define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1 0x7917
#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_SD 0x7906 #define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_SD 0x7906
#define PCI_DEVICE_ID_AMD_FAM17H_SMBUS 0x790B
#define PCI_DEVICE_ID_AMD_FAM17H_LPC 0x790E
#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_GBE 0x1458 #define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_GBE 0x1458
#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_GBE 0x1641 #define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_GBE 0x1641
#define PCI_DEVICE_ID_AMD_FAM17H_I2S_AC97 0x1644 #define PCI_DEVICE_ID_AMD_FAM17H_I2S_AC97 0x1644

3
src/soc/amd/common/block/lpc/lpc.c
View File

@ -322,9 +322,10 @@ static struct device_operations lpc_ops = {
}; };
static const unsigned short pci_device_ids[] = { static const unsigned short pci_device_ids[] = {
/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
PCI_DEVICE_ID_AMD_SB900_LPC, PCI_DEVICE_ID_AMD_SB900_LPC,
/* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */
PCI_DEVICE_ID_AMD_CZ_LPC, PCI_DEVICE_ID_AMD_CZ_LPC,
PCI_DEVICE_ID_AMD_FAM17H_LPC,
0 0
}; };
static const struct pci_driver lpc_driver __pci_driver = { static const struct pci_driver lpc_driver __pci_driver = {

1
src/soc/amd/common/block/smbus/sm.c
View File

@ -89,5 +89,6 @@ static struct device_operations smbus_ops = {
static const struct pci_driver smbus_driver __pci_driver = { static const struct pci_driver smbus_driver __pci_driver = {
.ops = &smbus_ops, .ops = &smbus_ops,
.vendor = PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
/* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */
.device = PCI_DEVICE_ID_AMD_CZ_SMBUS, .device = PCI_DEVICE_ID_AMD_CZ_SMBUS,
}; };

2
src/southbridge/amd/pi/hudson/lpc.c
View File

@ -354,7 +354,9 @@ static struct device_operations lpc_ops = {
}; };
static const unsigned short pci_device_ids[] = { static const unsigned short pci_device_ids[] = {
/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
PCI_DEVICE_ID_AMD_SB900_LPC, PCI_DEVICE_ID_AMD_SB900_LPC,
/* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */
PCI_DEVICE_ID_AMD_CZ_LPC, PCI_DEVICE_ID_AMD_CZ_LPC,
0 0
}; };

1
src/southbridge/amd/pi/hudson/sm.c
View File

@ -106,5 +106,6 @@ static struct device_operations smbus_ops = {
static const struct pci_driver smbus_driver __pci_driver = { static const struct pci_driver smbus_driver __pci_driver = {
.ops = &smbus_ops, .ops = &smbus_ops,
.vendor = PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
.device = PCI_DEVICE_ID_AMD_SB900_SM, .device = PCI_DEVICE_ID_AMD_SB900_SM,
}; };