[coreboot-gerrit] New patch to review for coreboot: e08bc08 southbridge/amd/{agesa, pi}/hudson/lpc.c: Sync together

Edward O'Callaghan (edward.ocallaghan@koparo.com) gerrit at coreboot.org
Sun Jun 7 11:47:11 CEST 2015


Edward O'Callaghan (edward.ocallaghan at koparo.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10453

-gerrit

commit e08bc087c30d9b86bafb2515223491a88fb3f376
Author: Edward O'Callaghan <edward.ocallaghan at koparo.com>
Date:   Sun Jun 7 19:42:47 2015 +1000

    southbridge/amd/{agesa,pi}/hudson/lpc.c: Sync together
    
    Resync together, backporting a fix for the initialization of
    8254 and 8259, as in commit 8d9a1bd5. Also fix a typo and
    reduce out useless whitespace differences.
    
    Change-Id: I9a9b1fb9083c5417a8d061f90a89074f2a601ddf
    Signed-off-by: Edward O'Callaghan <edward.ocallaghan at koparo.com>
    Reported-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
 src/southbridge/amd/agesa/hudson/lpc.c | 11 +++++++++--
 src/southbridge/amd/pi/hudson/lpc.c    | 16 ++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index 65cb955..c727fa9 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -30,6 +30,8 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
+#include <pc80/i8254.h>
+#include <pc80/i8259.h>
 #include "hudson.h"
 
 static void lpc_init(device_t dev)
@@ -79,6 +81,12 @@ static void lpc_init(device_t dev)
 	 * 1 tells cmos_init to always initialize the CMOS.
 	 */
 	cmos_init(0);
+
+	/* Initialize i8259 pic */
+	setup_i8259 ();
+
+	/* Initialize i8254 timers */
+	setup_i8254 ();
 }
 
 static void hudson_lpc_read_resources(device_t dev)
@@ -320,7 +328,6 @@ unsigned long acpi_fill_mcfg(unsigned long current)
 	return current;
 }
 
-
 static struct pci_operations lops_pci = {
 	.set_subsystem = pci_dev_set_subsystem,
 };
@@ -328,10 +335,10 @@ static struct pci_operations lops_pci = {
 static struct device_operations lpc_ops = {
 	.read_resources = hudson_lpc_read_resources,
 	.set_resources = hudson_lpc_set_resources,
+	.enable_resources = hudson_lpc_enable_resources,
 #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
 	.write_acpi_tables = acpi_write_hpet,
 #endif
-	.enable_resources = hudson_lpc_enable_resources,
 	.init = lpc_init,
 	.scan_bus = scan_lpc_bus,
 	.ops_pci = &lops_pci,
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index b813d12..c727fa9 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -28,8 +28,8 @@
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
 #include <arch/io.h>
-#include <arch/acpi.h>
 #include <arch/ioapic.h>
+#include <arch/acpi.h>
 #include <pc80/i8254.h>
 #include <pc80/i8259.h>
 #include "hudson.h"
@@ -134,7 +134,7 @@ static void hudson_lpc_set_resources(struct device *dev)
 /**
  * @brief Enable resources for children devices
  *
- * @param dev the device whos children's resources are to be enabled
+ * @param dev the device whose children's resources are to be enabled
  *
  */
 static void hudson_lpc_enable_childrens_resources(device_t dev)
@@ -316,18 +316,18 @@ static void hudson_lpc_enable_childrens_resources(device_t dev)
 	pci_write_config8(dev, 0x74, wiosize);
 }
 
-unsigned long acpi_fill_mcfg(unsigned long current)
-{
-	/* Just a dummy */
-	return current;
-}
-
 static void hudson_lpc_enable_resources(device_t dev)
 {
 	pci_dev_enable_resources(dev);
 	hudson_lpc_enable_childrens_resources(dev);
 }
 
+unsigned long acpi_fill_mcfg(unsigned long current)
+{
+	/* Just a dummy */
+	return current;
+}
+
 static struct pci_operations lops_pci = {
 	.set_subsystem = pci_dev_set_subsystem,
 };



More information about the coreboot-gerrit mailing list