summaryrefslogtreecommitdiff
path: root/src/soc/amd/sabrina
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2022-03-07 04:34:52 +0100
committerFelix Singer <felixsinger@posteo.net>2022-03-07 08:32:09 +0000
commit43b7f416783ccc98952a4eb5f9274907442b03e5 (patch)
tree86a45336e809bee5d2891f2be9cf00184da9bb18 /src/soc/amd/sabrina
parent2c423441c054d7a8c93cc814b9db5f8f7185bd0f (diff)
src: Make PCI ID define names shorter
Shorten define names containing PCI_{DEVICE,VENDOR}_ID_ with PCI_{DID,VID}_ using the commands below, which also take care of some spacing issues. An additional clean up of pci_ids.h is done in CB:61531. Used commands: * find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]\{2\}\([_0-9A-Za-z]\{8\}\)*[_0-9A-Za-z]\{0,5\}\)\t/PCI_\1ID_\3\t\t/g' * find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]*\)/PCI_\1ID_\3/g' Change-Id: If9027700f53b6d0d3964c26a41a1f9b8f62be178 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Diffstat (limited to 'src/soc/amd/sabrina')
-rw-r--r--src/soc/amd/sabrina/data_fabric.c34
-rw-r--r--src/soc/amd/sabrina/root_complex.c4
-rw-r--r--src/soc/amd/sabrina/xhci.c4
3 files changed, 21 insertions, 21 deletions
diff --git a/src/soc/amd/sabrina/data_fabric.c b/src/soc/amd/sabrina/data_fabric.c
index 8f821c3cc2..0a399599ed 100644
--- a/src/soc/amd/sabrina/data_fabric.c
+++ b/src/soc/amd/sabrina/data_fabric.c
@@ -104,21 +104,21 @@ void data_fabric_set_mmio_np(void)
static const char *data_fabric_acpi_name(const struct device *dev)
{
switch (dev->device) {
- case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF0:
+ case PCI_DID_AMD_FAM17H_MODELA0H_DF0:
return "DFD0";
- case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF1:
+ case PCI_DID_AMD_FAM17H_MODELA0H_DF1:
return "DFD1";
- case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF2:
+ case PCI_DID_AMD_FAM17H_MODELA0H_DF2:
return "DFD2";
- case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF3:
+ case PCI_DID_AMD_FAM17H_MODELA0H_DF3:
return "DFD3";
- case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF4:
+ case PCI_DID_AMD_FAM17H_MODELA0H_DF4:
return "DFD4";
- case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF5:
+ case PCI_DID_AMD_FAM17H_MODELA0H_DF5:
return "DFD5";
- case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF6:
+ case PCI_DID_AMD_FAM17H_MODELA0H_DF6:
return "DFD6";
- case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF7:
+ case PCI_DID_AMD_FAM17H_MODELA0H_DF7:
return "DFD7";
default:
printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device);
@@ -135,19 +135,19 @@ static struct device_operations data_fabric_ops = {
};
static const unsigned short pci_device_ids[] = {
- PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF0,
- PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF1,
- PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF2,
- PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF3,
- PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF4,
- PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF5,
- PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF6,
- PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF7,
+ PCI_DID_AMD_FAM17H_MODELA0H_DF0,
+ PCI_DID_AMD_FAM17H_MODELA0H_DF1,
+ PCI_DID_AMD_FAM17H_MODELA0H_DF2,
+ PCI_DID_AMD_FAM17H_MODELA0H_DF3,
+ PCI_DID_AMD_FAM17H_MODELA0H_DF4,
+ PCI_DID_AMD_FAM17H_MODELA0H_DF5,
+ PCI_DID_AMD_FAM17H_MODELA0H_DF6,
+ PCI_DID_AMD_FAM17H_MODELA0H_DF7,
0
};
static const struct pci_driver data_fabric_driver __pci_driver = {
.ops = &data_fabric_ops,
- .vendor = PCI_VENDOR_ID_AMD,
+ .vendor = PCI_VID_AMD,
.devices = pci_device_ids,
};
diff --git a/src/soc/amd/sabrina/root_complex.c b/src/soc/amd/sabrina/root_complex.c
index ae1b3b915a..8f91b2af81 100644
--- a/src/soc/amd/sabrina/root_complex.c
+++ b/src/soc/amd/sabrina/root_complex.c
@@ -227,6 +227,6 @@ static struct device_operations root_complex_operations = {
static const struct pci_driver family17_root_complex __pci_driver = {
.ops = &root_complex_operations,
- .vendor = PCI_VENDOR_ID_AMD,
- .device = PCI_DEVICE_ID_AMD_17H_MODEL_A0AF_NB,
+ .vendor = PCI_VID_AMD,
+ .device = PCI_DID_AMD_17H_MODEL_A0AF_NB,
};
diff --git a/src/soc/amd/sabrina/xhci.c b/src/soc/amd/sabrina/xhci.c
index c6c0545cc9..fdd0118d7b 100644
--- a/src/soc/amd/sabrina/xhci.c
+++ b/src/soc/amd/sabrina/xhci.c
@@ -50,7 +50,7 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe)
}
} else if (dev->bus->dev->path.pci.devfn == PCIE_GPP_C_DEVFN) {
if (dev->path.pci.devfn == XHCI2_DEVFN
- && dev->device == PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_XHCI2) {
+ && dev->device == PCI_DID_AMD_FAM17H_MODELA0H_XHCI2) {
*gpe = xhci_sci_sources[2].gpe;
return CB_SUCCESS;
}
@@ -62,7 +62,7 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe)
static void configure_xhci_sci(void *unused)
{
const struct device *xhci_2 = DEV_PTR(xhci_2);
- if (xhci_2->device == PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_XHCI2)
+ if (xhci_2->device == PCI_DID_AMD_FAM17H_MODELA0H_XHCI2)
gpe_configure_sci(xhci_sci_sources, ARRAY_SIZE(xhci_sci_sources));
else
gpe_configure_sci(xhci_sci_sources, ARRAY_SIZE(xhci_sci_sources) - 1);