diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-05-20 15:41:05 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-05-21 14:25:30 +0000 |
| commit | 0bc06ab4b1f5b2d05dd9cbeb1e8521a8a717a69c (patch) | |
| tree | 053e35ebe2cd30eb7c42b965b28c08df9e9b9ac0 | |
| parent | b11d4e3ea4ad6208d82f1bacfda52f6e70f7de8c (diff) | |
agesa/hudson pi/hudson: Use PCI_DEVICE_ID
Change to 16bit read of the standard register.
Change-Id: Id085935eb17838c07bd78716158e622f45f56906
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/26429
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | src/southbridge/amd/agesa/hudson/hudson.c | 5 | ||||
| -rw-r--r-- | src/southbridge/amd/pi/hudson/hudson.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c index 9fb81a6364..4fc473bdf4 100644 --- a/src/southbridge/amd/agesa/hudson/hudson.c +++ b/src/southbridge/amd/agesa/hudson/hudson.c @@ -20,6 +20,7 @@ #include <device/device.h> #include <device/pci.h> +#include <device/pci_def.h> #include <device/pci_ids.h> #include <device/pci_ops.h> #include <cbmem.h> @@ -83,7 +84,7 @@ void hudson_enable(struct device *dev) switch (dev->path.pci.devfn) { case PCI_DEVFN(0x14, 5): if (dev->enabled == 0) { - u32 usb_device_id = pci_read_config32(dev, 0) >> 16; + u32 usb_device_id = pci_read_config16(dev, PCI_DEVICE_ID); u8 reg8; if (usb_device_id == PCI_DEVICE_ID_AMD_SB900_USB_20_5) { /* turn off and remove device 0:14.5 from PCI space */ @@ -96,7 +97,7 @@ void hudson_enable(struct device *dev) case PCI_DEVFN(0x14, 7): if (dev->enabled == 0) { - u32 sd_device_id = pci_read_config32(dev, 0) >> 16; + u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID); /* turn off the SDHC controller in the PM reg */ u8 reg8; if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) { diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c index bd9deb135b..ecf041aaae 100644 --- a/src/southbridge/amd/pi/hudson/hudson.c +++ b/src/southbridge/amd/pi/hudson/hudson.c @@ -20,6 +20,7 @@ #include <device/device.h> #include <device/pci.h> +#include <device/pci_def.h> #include <device/pci_ids.h> #include <device/pci_ops.h> #include <cbmem.h> @@ -61,7 +62,7 @@ void hudson_enable(struct device *dev) switch (dev->path.pci.devfn) { case PCI_DEVFN(0x14, 7): /* SD */ if (dev->enabled == 0) { - u32 sd_device_id = pci_read_config32(dev, 0) >> 16; + u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID); /* turn off the SDHC controller in the PM reg */ u8 reg8; if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) { |