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

sb/amd/{agesa,pi}/hudson: Explicitly enable LPC controller 

Location in hudson_lpc_port80() was called conditionally.
Also move hudson_lpc_decode() call after enable_acpimmio_decode_pmXX()
due the change from IO to MMIO using pm_read/write.

Change-Id: I38e94e4b04f0a493052cfd3ffdd0a9c2ac0d07fc
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37595
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com>
This commit is contained in:
Kyösti Mälkki 2019-12-09 08:08:58 +02:00 committed by Patrick Georgi
parent 0a2de7b538
commit a244d5edd4
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/southbridge/amd/agesa/hudson/bootblock.c
View File

@ -74,8 +74,8 @@ void bootblock_soc_early_init(void)
u32 data; u32 data;
bootblock_southbridge_init(); bootblock_southbridge_init();
hudson_lpc_decode();
enable_acpimmio_decode_pm24(); enable_acpimmio_decode_pm24();
hudson_lpc_decode();
if (CONFIG(POST_DEVICE_PCI_PCIE)) if (CONFIG(POST_DEVICE_PCI_PCIE))
hudson_pci_port80(); hudson_pci_port80();

11
src/southbridge/amd/agesa/hudson/early_setup.c
View File

@ -20,6 +20,7 @@
#include <arch/io.h> #include <arch/io.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#include <amdblocks/acpimmio.h>
#include "hudson.h" #include "hudson.h"
@ -73,13 +74,6 @@ void hudson_lpc_port80(void)
u8 byte; u8 byte;
pci_devfn_t dev; pci_devfn_t dev;
/* Enable LPC controller */
outb(0xEC, 0xCD6);
byte = inb(0xCD7);
byte |= 1;
outb(0xEC, 0xCD6);
outb(byte, 0xCD7);
/* Enable port 80 LPC decode in pci function 3 configuration space. */ /* Enable port 80 LPC decode in pci function 3 configuration space. */
dev = PCI_DEV(0, 0x14, 3); dev = PCI_DEV(0, 0x14, 3);
byte = pci_read_config8(dev, 0x4a); byte = pci_read_config8(dev, 0x4a);
@ -92,6 +86,9 @@ void hudson_lpc_decode(void)
pci_devfn_t dev; pci_devfn_t dev;
u32 tmp; u32 tmp;
/* Enable LPC controller */
pm_write8(0xec, pm_read8(0xec) | 0x01);
dev = PCI_DEV(0, 0x14, 3); dev = PCI_DEV(0, 0x14, 3);
/* Serial port numeration on Hudson: /* Serial port numeration on Hudson:
* PORT0 - 0x3f8 * PORT0 - 0x3f8

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

@ -73,11 +73,11 @@ void bootblock_soc_early_init(void)
u32 data; u32 data;
bootblock_southbridge_init(); bootblock_southbridge_init();
hudson_lpc_decode();
if (CONFIG(SOUTHBRIDGE_AMD_PI_BOLTON)) if (CONFIG(SOUTHBRIDGE_AMD_PI_BOLTON))
enable_acpimmio_decode_pm24(); enable_acpimmio_decode_pm24();
else else
enable_acpimmio_decode_pm04(); enable_acpimmio_decode_pm04();
hudson_lpc_decode();
if (CONFIG(POST_DEVICE_PCI_PCIE)) if (CONFIG(POST_DEVICE_PCI_PCIE))
hudson_pci_port80(); hudson_pci_port80();

11
src/southbridge/amd/pi/hudson/early_setup.c
View File

@ -22,6 +22,7 @@
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#include <amdblocks/acpimmio.h>
#include "hudson.h" #include "hudson.h"
#include "pci_devs.h" #include "pci_devs.h"
@ -106,13 +107,6 @@ void hudson_lpc_port80(void)
u8 byte; u8 byte;
pci_devfn_t dev; pci_devfn_t dev;
/* Enable LPC controller */
outb(0xEC, 0xCD6);
byte = inb(0xCD7);
byte |= 1;
outb(0xEC, 0xCD6);
outb(byte, 0xCD7);
/* Enable port 80 LPC decode in pci function 3 configuration space. */ /* Enable port 80 LPC decode in pci function 3 configuration space. */
dev = PCI_DEV(0, 0x14, 3); dev = PCI_DEV(0, 0x14, 3);
byte = pci_read_config8(dev, 0x4a); byte = pci_read_config8(dev, 0x4a);
@ -125,6 +119,9 @@ void hudson_lpc_decode(void)
pci_devfn_t dev; pci_devfn_t dev;
u32 tmp; u32 tmp;
/* Enable LPC controller */
pm_write8(0xec, pm_read8(0xec) | 0x01);
dev = PCI_DEV(0, 0x14, 3); dev = PCI_DEV(0, 0x14, 3);
/* Serial port numeration on Hudson: /* Serial port numeration on Hudson:
* PORT0 - 0x3f8 * PORT0 - 0x3f8