Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6266
-gerrit
commit 45b5e8bf30876d60ff24249158ae2fd33253f026 Author: Felix Held felix-coreboot@felixheld.de Date: Sat Jul 19 00:21:43 2014 +0200
mainboards/asrock/e350m1: use nct5572d as superio chip
Using the right superio chip driver fixes the no ethernet device after reboot issue.
Change-Id: I4bc78406afd3b0e10a1b04b561147e0ed94cc494 Signed-off-by: Felix Held felix-coreboot@felixheld.de --- src/mainboard/asrock/e350m1/BiosCallOuts.c | 8 +++--- src/mainboard/asrock/e350m1/Kconfig | 2 +- src/mainboard/asrock/e350m1/devicetree.cb | 42 ++++++++++++++++-------------- src/mainboard/asrock/e350m1/romstage.c | 8 +++--- 4 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/src/mainboard/asrock/e350m1/BiosCallOuts.c b/src/mainboard/asrock/e350m1/BiosCallOuts.c index 09571dd..acdddf2 100644 --- a/src/mainboard/asrock/e350m1/BiosCallOuts.c +++ b/src/mainboard/asrock/e350m1/BiosCallOuts.c @@ -25,11 +25,6 @@ #include <northbridge/amd/agesa/family14/dimmSpd.h> #include <stdlib.h>
-/* Should AGESA_GNB_PCIE_SLOT_RESET use agesa_NoopSuccess? - * - * Board is known to have some issues with integrated NIC and - * might need implementation to drive some GPIOs. - */
static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
@@ -101,6 +96,9 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINT32 Data, VOID *Config TempData8 |= Data8; Write64Mem8(GpioMmioAddr+SB_GPIO_REG179, TempData8);
+ /* this seems to be just copy-pasted from the AMD reference boards and needs + * some investigation + */ switch(MemData->ParameterListPtr->DDR3Voltage){ case VOLT1_35: Data8 = Read64Mem8 (GpioMmioAddr+SB_GPIO_REG178); diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index 00cdaa7..2f2e58d 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CPU_AMD_AGESA_FAMILY14 select NORTHBRIDGE_AMD_AGESA_FAMILY14 select SOUTHBRIDGE_AMD_CIMX_SB800 - select SUPERIO_WINBOND_W83627HF + select SUPERIO_NUVOTON_NCT5572D select SB_SUPERIO_HWM select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE diff --git a/src/mainboard/asrock/e350m1/devicetree.cb b/src/mainboard/asrock/e350m1/devicetree.cb index e2096c0..7fcf0ef 100644 --- a/src/mainboard/asrock/e350m1/devicetree.cb +++ b/src/mainboard/asrock/e350m1/devicetree.cb @@ -54,22 +54,15 @@ chip northbridge/amd/agesa/family14/root_complex end # SM device pci 14.1 on end # IDE 0x439c device pci 14.2 on end # HDA 0x4383 - device pci 14.3 on # LPC 0x439d - chip superio/winbond/w83627hf - device pnp 2e.0 off # Floppy - io 0x60 = 0x3f0 - irq 0x70 = 6 - drq 0x74 = 2 - end - device pnp 2e.1 off # Parallel Port - io 0x60 = 0x378 - irq 0x70 = 7 - end + device pci 14.3 on # LPC + chip superio/nuvoton/nct5572d + device pnp 2e.0 off end # FDC; not externally available on the NCT5572D, but on the die + device pnp 2e.1 off end # LPT1; same as FDC device pnp 2e.2 on # Com1 io 0x60 = 0x3f8 irq 0x70 = 4 end - device pnp 2e.3 off # Com2 + device pnp 2e.3 off # IR io 0x60 = 0x2f8 irq 0x70 = 3 end @@ -81,19 +74,30 @@ chip northbridge/amd/agesa/family14/root_complex end device pnp 2e.6 off # CIR io 0x60 = 0x100 + irq 0x70 = 0 end - device pnp 2e.7 off # GAME_MIDI_GIPO1 - io 0x60 = 0x220 - io 0x62 = 0x300 - irq 0x70 = 9 - end - device pnp 2e.8 off end # GPIO2 - device pnp 2e.9 off end # GPIO3 + device pnp 2e.7 off end # GIPO689 + device pnp 2e.8 off end # WDT + device pnp 2e.9 off end # GPIO235 device pnp 2e.a on end # ACPI device pnp 2e.b on # HW Monitor io 0x60 = 0x290 + io 0x62 = 0x0000 # SB-TSI currently not implemented irq 0x70 = 5 end + device pnp 2e.c off end # PECI + device pnp 2e.d off end # SUSLED + device pnp 2e.e off # CIRWKUP + io 0x60 = 0x0000 + irq 0x70 = 0 + end + device pnp 2e.f off end # GPIO_PP_OD + device pnp 2e.009 on end # GPIO2 + device pnp 2e.109 off end # GPIO3 + device pnp 2e.309 off end # GPIO5 + device pnp 2e.107 off end # GPIO6 + device pnp 2e.307 on end # GPIO8 + device pnp 2e.407 off end # GPIO9 end end #LPC device pci 14.4 on end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0} diff --git a/src/mainboard/asrock/e350m1/romstage.c b/src/mainboard/asrock/e350m1/romstage.c index 5223360..47704ed 100644 --- a/src/mainboard/asrock/e350m1/romstage.c +++ b/src/mainboard/asrock/e350m1/romstage.c @@ -33,14 +33,14 @@ #include "agesawrapper.h" #include <northbridge/amd/agesa/agesawrapper_call.h> #include "cpu/x86/bist.h" -#include <superio/winbond/common/winbond.h> -#include <superio/winbond/w83627hf/w83627hf.h> +#include <superio/nuvoton/common/nuvoton.h> +#include <superio/nuvoton/nct5572d/nct5572d.h> #include "cpu/x86/lapic.h" #include <sb_cimx.h> #include "SBPLATFORM.h"
-#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) +#define SERIAL_DEV PNP_DEV(0x2e, NCT5572D_SP1)
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { @@ -61,7 +61,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) sb_Poweron_Init();
post_code(0x31); - winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); }