Paul Menzel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39377 )
Change subject: amd/agesa/hudson: Disable `isa_dma_init()` ......................................................................
amd/agesa/hudson: Disable `isa_dma_init()`
coreboot on the ASUS F2A85-M PRO hangs there. After removing it, it runs through. SeaBIOS also hangs reading CBFS, but GRUB works fine.
So it looks like, it’s needed for some legacy stuff.
Change-Id: I7f581606f9f234cfb7a3fec2cc7f4172589f8153 Signed-off-by: Paul Menzel pmenzel@molgen.mpg.de --- M src/southbridge/amd/agesa/hudson/lpc.c 1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/39377/1
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c index 9c65d04..251ddd1 100644 --- a/src/southbridge/amd/agesa/hudson/lpc.c +++ b/src/southbridge/amd/agesa/hudson/lpc.c @@ -23,7 +23,6 @@ #include <device/pci_ops.h> #include <device/pci_def.h> #include <pc80/mc146818rtc.h> -#include <pc80/isa-dma.h> #include <arch/io.h> #include <arch/ioapic.h> #include <arch/acpi.h> @@ -44,9 +43,6 @@ dword |= 1 << 20; pci_write_config32(sm_dev, 0x64, dword);
- /* Initialize isa dma */ - isa_dma_init(); - /* Enable DMA transaction on the LPC bus */ byte = pci_read_config8(dev, 0x40); byte |= (1 << 2);
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39377 )
Change subject: amd/agesa/hudson: Disable `isa_dma_init()` ......................................................................
Patch Set 1:
Here is the failed log with `isa_dma_init()`. The changes are for enabling (commit hash and dirty).(Added debug prints showed, where it did not return from.)
``` coreboot-4.11-1492-geb0a992765-dirty Sat Mar 7 19:50:25 UTC 2020 bootblock starting (log level: 7)... FMAP: Found "FLASH" version 1.1 at 0x0. FMAP: base = 0xff800000 size = 0x800000 #areas = 3 FMAP: area COREBOOT found @ 200 (8388096 bytes) CBFS: Locating 'fallback/romstage' CBFS: Found @ offset 30000 size 4c36c BS: bootblock times (exec / console): total (unknown) / 16 ms
coreboot-4.11-1492-geb0a992765-dirty Sat Mar 7 19:50:25 UTC 2020 romstage starting (log level: 7)... APIC 00: CPU Family_Model = 00610f31
APIC 00: ** Enter AmdInitReset [00020007] Fch OEM config in INIT RESET PCI: 00:14.4 bridge ctrl <- 0013 PCI: 00:14.4 cmd <- 00 PCI: 00:14.5 cmd <- 02 PCI: 00:15.0 bridge ctrl <- 0013 PCI: 00:15.0 cmd <- 00 PCI: 00:15.1 bridge ctrl <- 0013 PCI: 00:15.1 cmd <- 06 PCI: 00:16.0 cmd <- 02 PCI: 00:16.2 cmd <- 02 PCI: 00:18.0 cmd <- 00 PCI: 00:18.1 subsystem <- 1022/1410 PCI: 00:18.1 cmd <- 00 PCI: 00:18.2 subsystem <- 1022/1410 PCI: 00:18.2 cmd <- 00 PCI: 00:18.3 subsystem <- 1022/1410 PCI: 00:18.3 cmd <- 00 PCI: 00:18.4 subsystem <- 1022/1410 PCI: 00:18.4 cmd <- 00 PCI: 00:18.5 subsystem <- 1022/1410 PCI: 00:18.5 cmd <- 00 PCI: 03:00.0 cmd <- ffff done. BS: BS_DEV_ENABLE run times (exec / console): 0 / 30 ms Initializing devices... Root Device init Root Device init finished in 0 msecs CPU_CLUSTER: 0 init start_eip=0x00001000, code_size=0x00000031 Initializing CPU #0 CPU: vendor AMD device 610f31 CPU: family 15, model 13, stepping 01 Model 15 Init.
MTRR check Fixed MTRRs : Enabled Variable MTRRs: Enabled
Enabling cache Setting up local APIC... apic_id: 0x10 done. siblings = 01, CPU #0 initialized Initializing CPU #1 Waiting for 1 CPUS to stop CPU: vendor AMD device 610f31 CPU: family 15, model 13, stepping 01 Model 15 Init.
MTRR check Fixed MTRRs : Enabled Variable MTRRs: Enabled
Enabling cache Setting up local APIC... apic_id: 0x11 done. siblings = 01, CPU #1 initialized All AP CPUs stopped (1060 loops) CPU_CLUSTER: 0 init finished in 40 msecs DOMAIN: 0000 init DOMAIN: 0000 init finished in 0 msecs PCI: 00:00.0 init PCI: 00:00.0 init finished in 0 msecs PCI: 00:01.0 init PCI: 00:01.0 init finished in 0 msecs PCI: 00:01.1 init PCI: 00:01.1 init finished in 0 msecs PCI: 00:11.0 init PCI: 00:11.0 init finished in 0 msecs PCI: 00:12.0 init PCI: 00:12.0 init finished in 0 msecs PCI: 00:12.2 init PCI: 00:12.2 init finished in 0 msecs PCI: 00:13.0 init PCI: 00:13.0 init finished in 0 msecs PCI: 00:13.2 init PCI: 00:13.2 init finished in 0 msecs PCI: 00:14.0 init IOAPIC: Initializing IOAPIC at 0xfec00000 IOAPIC: Bootstrap Processor Local APIC = 0x10 IOAPIC: ID = 0x04 IOAPIC: 24 interrupts IOAPIC: Enabling interrupts on FSB PCI: 00:14.0 init finished in 7 msecs PCI: 00:14.2 init PCI: 00:14.2 init finished in 0 msecs PCI: 00:14.3 init ```
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39377 )
Change subject: amd/agesa/hudson: Disable `isa_dma_init()` ......................................................................
Patch Set 1: Code-Review+1
Hello build bot (Jenkins), Angel Pons,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39377
to look at the new patch set (#2).
Change subject: amd/agesa/hudson: Do not write to DMA1_RESET_REG ......................................................................
amd/agesa/hudson: Do not write to DMA1_RESET_REG
coreboot on the ASUS F2A85-M PRO hangs there. After removing it, it runs through. SeaBIOS also hangs at the same spot.
diff --git a/src/hw/dma.c b/src/hw/dma.c index 20c9fbb..ff6cb84 100644 --- a/src/hw/dma.c +++ b/src/hw/dma.c @@ -58,7 +58,7 @@ void dma_setup(void) { // first reset the DMA controllers - outb(0, PORT_DMA1_MASTER_CLEAR); + /* outb(0, PORT_DMA1_MASTER_CLEAR); */ outb(0, PORT_DMA2_MASTER_CLEAR);
// then initialize the DMA controllers
Change-Id: I7f581606f9f234cfb7a3fec2cc7f4172589f8153 Signed-off-by: Paul Menzel pmenzel@molgen.mpg.de --- M src/drivers/pc80/pc/isa-dma.c M src/southbridge/amd/agesa/hudson/lpc.c 2 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/39377/2
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39377 )
Change subject: amd/agesa/hudson: Do not write to DMA1_RESET_REG ......................................................................
Patch Set 2:
(5 comments)
https://review.coreboot.org/c/coreboot/+/39377/2/src/drivers/pc80/pc/isa-dma... File src/drivers/pc80/pc/isa-dma.c:
https://review.coreboot.org/c/coreboot/+/39377/2/src/drivers/pc80/pc/isa-dma... PS2, Line 42: printk(BIOS_DEBUG, "isa_dma_init: 0\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/2/src/drivers/pc80/pc/isa-dma... PS2, Line 44: printk(BIOS_DEBUG, "isa_dma_init: 1\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/2/src/drivers/pc80/pc/isa-dma... PS2, Line 46: printk(BIOS_DEBUG, "isa_dma_init: 2\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/2/src/drivers/pc80/pc/isa-dma... PS2, Line 48: printk(BIOS_DEBUG, "isa_dma_init: 3\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/2/src/drivers/pc80/pc/isa-dma... PS2, Line 50: printk(BIOS_DEBUG, "isa_dma_init: 4\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
Hello build bot (Jenkins), Angel Pons,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39377
to look at the new patch set (#3).
Change subject: amd/agesa/hudson: Do not write to DMA1_RESET_REG ......................................................................
amd/agesa/hudson: Do not write to DMA1_RESET_REG
coreboot on the ASUS F2A85-M PRO hangs there. After removing it, it runs through. SeaBIOS also hangs at the same spot.
diff --git a/src/hw/dma.c b/src/hw/dma.c index 20c9fbb..ff6cb84 100644 --- a/src/hw/dma.c +++ b/src/hw/dma.c @@ -58,7 +58,7 @@ void dma_setup(void) { // first reset the DMA controllers - outb(0, PORT_DMA1_MASTER_CLEAR); + /* outb(0, PORT_DMA1_MASTER_CLEAR); */ outb(0, PORT_DMA2_MASTER_CLEAR);
// then initialize the DMA controllers
Change-Id: I7f581606f9f234cfb7a3fec2cc7f4172589f8153 Signed-off-by: Paul Menzel pmenzel@molgen.mpg.de --- M src/drivers/pc80/pc/isa-dma.c 1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/39377/3
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39377 )
Change subject: amd/agesa/hudson: Do not write to DMA1_RESET_REG ......................................................................
Patch Set 3:
(5 comments)
https://review.coreboot.org/c/coreboot/+/39377/3/src/drivers/pc80/pc/isa-dma... File src/drivers/pc80/pc/isa-dma.c:
https://review.coreboot.org/c/coreboot/+/39377/3/src/drivers/pc80/pc/isa-dma... PS3, Line 42: printk(BIOS_DEBUG, "isa_dma_init: 0\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/3/src/drivers/pc80/pc/isa-dma... PS3, Line 44: printk(BIOS_DEBUG, "isa_dma_init: 1\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/3/src/drivers/pc80/pc/isa-dma... PS3, Line 46: printk(BIOS_DEBUG, "isa_dma_init: 2\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/3/src/drivers/pc80/pc/isa-dma... PS3, Line 48: printk(BIOS_DEBUG, "isa_dma_init: 3\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/3/src/drivers/pc80/pc/isa-dma... PS3, Line 50: printk(BIOS_DEBUG, "isa_dma_init: 4\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39377 )
Change subject: amd/agesa/hudson: Do not write to DMA1_RESET_REG ......................................................................
Patch Set 4:
(5 comments)
https://review.coreboot.org/c/coreboot/+/39377/4/src/drivers/pc80/pc/isa-dma... File src/drivers/pc80/pc/isa-dma.c:
https://review.coreboot.org/c/coreboot/+/39377/4/src/drivers/pc80/pc/isa-dma... PS4, Line 42: printk(BIOS_DEBUG, "isa_dma_init: 0\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/4/src/drivers/pc80/pc/isa-dma... PS4, Line 44: printk(BIOS_DEBUG, "isa_dma_init: 1\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/4/src/drivers/pc80/pc/isa-dma... PS4, Line 46: printk(BIOS_DEBUG, "isa_dma_init: 2\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/4/src/drivers/pc80/pc/isa-dma... PS4, Line 48: printk(BIOS_DEBUG, "isa_dma_init: 3\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/4/src/drivers/pc80/pc/isa-dma... PS4, Line 50: printk(BIOS_DEBUG, "isa_dma_init: 4\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39377 )
Change subject: amd/agesa/hudson: Do not write to DMA1_RESET_REG ......................................................................
Patch Set 5:
(5 comments)
https://review.coreboot.org/c/coreboot/+/39377/5/src/drivers/pc80/pc/isa-dma... File src/drivers/pc80/pc/isa-dma.c:
https://review.coreboot.org/c/coreboot/+/39377/5/src/drivers/pc80/pc/isa-dma... PS5, Line 42: printk(BIOS_DEBUG, "isa_dma_init: 0\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/5/src/drivers/pc80/pc/isa-dma... PS5, Line 44: printk(BIOS_DEBUG, "isa_dma_init: 1\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/5/src/drivers/pc80/pc/isa-dma... PS5, Line 46: printk(BIOS_DEBUG, "isa_dma_init: 2\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/5/src/drivers/pc80/pc/isa-dma... PS5, Line 48: printk(BIOS_DEBUG, "isa_dma_init: 3\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
https://review.coreboot.org/c/coreboot/+/39377/5/src/drivers/pc80/pc/isa-dma... PS5, Line 50: printk(BIOS_DEBUG, "isa_dma_init: 4\n"); Prefer using '"%s...", __func__' to using 'isa_dma_init', this function's name, in a string
Martin L Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/39377?usp=email )
Change subject: amd/agesa/hudson: Do not write to DMA1_RESET_REG ......................................................................
Abandoned
This patch has not been touched in over 12 months. Anyone who wants to take over work on this patch, please feel free to restore it and do any work needed to get it merged. If you create a new patch based on this work, please credit the original author.