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

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>
This commit is contained in:
Kyösti Mälkki 2018-05-20 15:41:05 +03:00
parent b11d4e3ea4
commit 0bc06ab4b1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/southbridge/amd/agesa/hudson/hudson.c
View File

@ -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) {

3
src/southbridge/amd/pi/hudson/hudson.c
View File

@ -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) {