sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/sabrina: use correct PCI IDs

Browse Source 
Replace the Renoir/Cezanne PCI IDs with the Sabrina ones that were added
in commit 27b02c2eee68f4b6c8520c4737224aaaf81f137d (include/device/
pci_ids.h: add PCI IDs for AMD Family 17h Model A0h SoC).

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I427df6f8e8c08fb47ae8513b6cf1085d4294e28f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61080
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Felix Held 2022-01-11 16:39:44 +01:00
parent a8d7c043f6
commit af356d313d
2 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/soc/amd/sabrina/data_fabric.c
View File

@ -103,29 +103,21 @@ void data_fabric_set_mmio_np(void)
static const char *data_fabric_acpi_name(const struct device *dev) static const char *data_fabric_acpi_name(const struct device *dev)
{ {
switch (dev->device) { switch (dev->device) {
case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0: case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF0:
case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0:
return "DFD0"; return "DFD0";
case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1: case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF1:
case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1:
return "DFD1"; return "DFD1";
case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2: case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF2:
case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2:
return "DFD2"; return "DFD2";
case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3: case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF3:
case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3:
return "DFD3"; return "DFD3";
case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4: case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF4:
case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4:
return "DFD4"; return "DFD4";
case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5: case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF5:
case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5:
return "DFD5"; return "DFD5";
case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6: case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF6:
case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6:
return "DFD6"; return "DFD6";
case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7: case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF7:
case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7:
return "DFD7"; return "DFD7";
default: default:
printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device); printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device);
@ -142,24 +134,14 @@ static struct device_operations data_fabric_ops = {
}; };
static const unsigned short pci_device_ids[] = { static const unsigned short pci_device_ids[] = {
/* Renoir DF devices */ PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF0,
PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0, PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF1,
PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1, PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF2,
PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2, PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF3,
PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3, PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF4,
PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4, PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF5,
PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5, PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF6,
PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6, PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF7,
PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7,
/* Cezanne DF devices */
PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0,
PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1,
PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2,
PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3,
PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4,
PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5,
PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6,
PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7,
0 0
}; };

2
src/soc/amd/sabrina/root_complex.c
View File

@ -225,5 +225,5 @@ static struct device_operations root_complex_operations = {
static const struct pci_driver family17_root_complex __pci_driver = { static const struct pci_driver family17_root_complex __pci_driver = {
.ops = &root_complex_operations, .ops = &root_complex_operations,
.vendor = PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB, .device = PCI_DEVICE_ID_AMD_17H_MODEL_A0AF_NB,
}; };