March 2013 - SerialICE - mail.coreboot.org

New patch to review for serialice: 9c4c45a Do not add RAM filters on default_setup()
by Kyösti Mälkki March 4, 2013

March 4, 2013

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2580 -gerrit commit 9c4c45a618bae64b8982098051dcc6b3bce69dac Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Mar 4 10:17:37 2013 +0200 Do not add RAM filters on default_setup() To forward JEDEC init cycles to dram memory banks, using the memory fallback -filter, we must not enable RAM filters already at start-up. A mainboard-specific hook shall call enable_ram() only after raminit and possible quick memtest have completed. Change-Id: I9b3c0283fd4dd15b4d12e96e02e70d8ccc77f835 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/memory.lua | 49 ++++++++++++------------------------------- SerialICE/simba/serialice.lua | 1 - 2 files changed, 13 insertions(+), 37 deletions(-) diff --git a/SerialICE/simba/memory.lua b/SerialICE/simba/memory.lua index 4e60bad..b05f09c 100644 --- a/SerialICE/simba/memory.lua +++ b/SerialICE/simba/memory.lua @@ -13,12 +13,7 @@ function mem_qemu_rom_pre(f, action) end function mem_rom_post(f, action) - if not action.write then - return true - end - -- Writes to ROM space fall-thru to the fallback filter, - -- so they get logged there. - return false + return true end filter_rom_low = { @@ -81,21 +76,15 @@ end ram_is_initialized = false --- This is handled by SerialICE but *NOT* exclusively. --- Writes end up in Qemu memory, too -function mem_ram_low(f, action) - if ram_is_initialized then - -- RAM init is done. Send all RAM accesses - -- to Qemu. Using the target as storage would - -- only slow execution down. - action.to_hw = false - action.to_qemu = true - else - -- RAM init has not been marked done yet. - -- so send reads to the target only. - action.to_hw = true - action.to_qemu = action.write - end +function mem_qemu_only(f, action) + action.to_hw = false + action.to_qemu = true + return true +end + +function mem_target_only(f, action) + action.to_hw = true + action.to_qemu = false return true end @@ -113,14 +102,10 @@ function mem_smi_vga(f, action) end -function mem_post_pre_ram_only(f, action) - return ram_is_initialized -end - filter_ram_low = { name = "MEM", pre = mem_ram_low, - post = mem_post_pre_ram_only, + post = mem_post, hide = true, base = 0x0, size = 0xa0000 @@ -138,19 +123,12 @@ filter_smi_vga = { filter_ram_low_2 = { name = "MEM", pre = mem_ram_low, - post = mem_post_pre_ram_only, + post = mem_post, hide = true, base = 0xc0000, size = 0x20000 } - -function mem_target_only(f, action) - action.to_hw = true - action.to_qemu = false - return true -end - -- 3.25GB RAM. This is handled by SerialICE. -- FIXME: use TOLM here @@ -160,7 +138,7 @@ end filter_ram_high = { name = "MEM", pre = mem_target_only, - post = mem_post_pre_ram_only, + post = mem_post, hide = true, base = 0x100000, size = 0xd0000000 - 0x100000 @@ -172,7 +150,6 @@ function ram_enabled() end function enable_ram() - enable_hook(mem_hooks, filter_ram_low) enable_hook(mem_hooks, filter_smi_vga) enable_hook(mem_hooks, filter_ram_low_2) diff --git a/SerialICE/simba/serialice.lua b/SerialICE/simba/serialice.lua index 82a2b03..7cabf67 100644 --- a/SerialICE/simba/serialice.lua +++ b/SerialICE/simba/serialice.lua @@ -78,7 +78,6 @@ function do_minimal_setup() end function do_default_setup() - enable_ram() enable_hook(mem_hooks, filter_lapic) enable_hook(mem_hooks, filter_ioapic) enable_hook(io_hooks, filter_pci_io_cfg)

1 0

New patch to review for serialice: 8f1e36e Refactor logging functions
by Kyösti Mälkki March 4, 2013

March 4, 2013

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2579 -gerrit commit 8f1e36e9f83bc221b2a303beabe804af472d5dbf Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Mar 3 14:07:18 2013 +0200 Refactor logging functions This adds root_info() and resource_info() functions to add informational lines (tagged with I...) in the log. This also fixes index and cs:eip values printed for these lines. Change-Id: Ib83140037ef4e910f2828783fd7505eac74fac2f Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/hooks.lua | 61 +++++++++++++++++++------------------------ SerialICE/simba/output.lua | 34 ++++++++++++++---------- SerialICE/simba/pci_cfg.lua | 6 ++--- SerialICE/simba/serialice.lua | 6 ++--- 4 files changed, 53 insertions(+), 54 deletions(-) diff --git a/SerialICE/simba/hooks.lua b/SerialICE/simba/hooks.lua index 72e1a55..7e530b1 100644 --- a/SerialICE/simba/hooks.lua +++ b/SerialICE/simba/hooks.lua @@ -1,10 +1,13 @@ -function new_list() - return { list = nil } +froot = { id = 0, name = "SerialICE" } +fresource = { id = 1, name = "Resource" } + +function new_hooks(str) + return { list = nil, name = str } end -next_filter_id = 1 +next_filter_id = 2 next_action_id = 1 current_parent_id = 0 @@ -19,16 +22,15 @@ function new_parent_action() end -io_hooks = new_list() -mem_hooks = new_list() - -cpumsr_hooks = new_list() -cpuid_hooks = new_list() +io_hooks = new_hooks("IO") +mem_hooks = new_hooks("MEM") +cpumsr_hooks = new_hooks("CPU MSR") +cpuid_hooks = new_hooks("CPUID") function enable_hook(list, filter) if not filter then - printks(froot, "Enable_hook called with filter==nil\n") + root_info("Enable_hook called with filter==nil\n") return end @@ -40,37 +42,27 @@ function enable_hook(list, filter) end if not found then filter.id = next_filter_id + filter.list = list next_filter_id = next_filter_id + 1 list.list = { next = list.list, hook = filter } end - if (list == io_hooks) then - printks(fresource, "[%04x] IO [%04x-%04x] = %s\n", - filter.id, filter.base, filter.base + filter.size - 1, filter.name) - elseif (list == mem_hooks) then - printks(fresource, "[%04x] MEM [%08x-%08x] = %s\n", - filter.id, filter.base, filter.base + filter.size - 1, filter.name) - else - printks(fresource, "[%04x] %s\n", filter.id, filter.name) - end + update_hook(filter) filter.enable = true end -function disable_hook(list, filter) - if not filter then - return - end - local l = list.list - local found = false - while l and not found do - found = (l.hook == filter) - l = l.next +function disable_hook(f) + if f.id and f.enable and f.enable == true then + resource_info(f, "disabled") end - if found then - printks(froot, "id=%04x disabled\n", filter.id) - filter.enable = false + f.enable = false +end + +function update_hook(f) + if f.list == io_hooks or f.list == mem_hooks then + resource_info(f, "[%04x-%04x] = %s", + f.base, f.base + f.size - 1, f.name) else - printks(filter, "disabled\n") - filter.enable = false + resource_info(f, "%s", f.name) end end @@ -157,7 +149,7 @@ function generic_io_bar(bar) if (bar.f.base ~= 0) then enable_hook(io_hooks, bar.f) else - disable_hook(io_hooks, bar.f) + disable_hook(bar.f) end end @@ -176,7 +168,7 @@ function generic_mmio_bar(bar) if bar.f.base ~= 0 then enable_hook(mem_hooks, bar.f) else - disable_hook(mem_hooks, bar.f) + disable_hook(bar.f) end end @@ -233,6 +225,7 @@ function pre_action(action, dir_wr, addr, size, data) action.dropped = false action.to_hw = false action.to_qemu = false + action.info_only = false action.write = dir_wr action.addr = addr diff --git a/SerialICE/simba/output.lua b/SerialICE/simba/output.lua index fac895d..a01e074 100644 --- a/SerialICE/simba/output.lua +++ b/SerialICE/simba/output.lua @@ -1,14 +1,4 @@ - -froot = { - id = 0, - name = "SerialICE", -} - -fresource = { - name = "Resource", -} - -- ------------------------------------------------------------------- -- logging functions @@ -24,6 +14,8 @@ function printk(f, action, fmt, ...) local str = "" if action.undefined or action.f or action == cpu_action then str = str .. "R" + elseif action.info_only then + str = str .. "I" else str = str .. "." end @@ -58,10 +50,24 @@ function printk(f, action, fmt, ...) end end -function printks(f, fmt, ...) - print_address(0,0,"I...",0,0) - printf("%s: ", f.name) - printf(fmt, ...) +info_action = {} + +function print_info(f, str) + pre_action(info_action) + info_action.info_only = true + info_action.parent_id = current_parent_id + info_action.my_id = next_action_id + printk(f, info_action, "%s", str) +end + +function root_info(fmt, ...) + print_info(froot, string.format(fmt, ...)) +end + +function resource_info(f, fmt, ...) + print_info(fresource, + string.format("[%04x] %s ", f.id, f.list.name) .. + string.format(fmt, ...) .. "\n") end function trim (s) diff --git a/SerialICE/simba/pci_cfg.lua b/SerialICE/simba/pci_cfg.lua index d874e9f..e7bdf65 100644 --- a/SerialICE/simba/pci_cfg.lua +++ b/SerialICE/simba/pci_cfg.lua @@ -8,11 +8,11 @@ pci_cfg_action = {} PCI_CFG_READ = false PCI_CFG_WRITE = true -pci_cfg_hooks = new_list() +pci_cfg_hooks = new_hooks("PCI") function add_pci_cfg_hook(dev, reg, size, func) local bdfr = bit32.bor(dev.pci_dev, reg) - local name = string.format("PCI %x:%02x.%x [%04x]", + local name = string.format("%x:%02x.%x [%03x]", bit32.band(0xff,bit32.rshift(bdfr, 20)), bit32.band(0x1f,bit32.rshift(bdfr, 15)), bit32.band(0x7,bit32.rshift(bdfr, 12)), bit32.band(0xfff,bdfr)) local filter = { @@ -327,6 +327,6 @@ end function pcie_mm_disable(dev, reg, base, size) if dev.bar and dev.bar[reg] and dev.bar[reg].f then - disable_hook(mem_hooks, dev.bar[reg].f) + disable_hook(dev.bar[reg].f) end end diff --git a/SerialICE/simba/serialice.lua b/SerialICE/simba/serialice.lua index 61e2fd1..82a2b03 100644 --- a/SerialICE/simba/serialice.lua +++ b/SerialICE/simba/serialice.lua @@ -98,16 +98,16 @@ if mainboard_script then io.close(mainboard_script) assert(mainboard_lua, ferr) mainboard_lua() - printks(froot, "Mainboard script %s initialized.\n", mainboard_file) + root_info("Mainboard script %s initialized.\n", mainboard_file) do_minimal_setup() do_mainboard_setup() else - printks(froot, "Mainboard script %s not found.\n", mainboard_file) + root_info("Mainboard script %s not found.\n", mainboard_file) do_minimal_setup() do_default_setup() end -printks(froot, "LUA script initialized.\n") +root_info("LUA script initialized.\n") return true

1 0

New patch to review for serialice: de3e738 Drop initial value of filter id
by Kyösti Mälkki March 4, 2013

March 4, 2013

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2578 -gerrit commit de3e738b73b1aa18d296c51442947b7fee215eeb Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Mar 3 19:02:39 2013 +0200 Drop initial value of filter id All filters are assigned id number in enable_hooks(). Change-Id: I3300676caa7ffacf163c41b2df55b18b9676e3b3 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/aopen_dxpl_plus.lua | 1 - SerialICE/simba/asus_p4p800_vm.lua | 1 - SerialICE/simba/commell_lv_672.lua | 1 - SerialICE/simba/conroexfire_esata2.lua | 1 - SerialICE/simba/core_io.lua | 2 -- SerialICE/simba/cpu.lua | 5 ----- SerialICE/simba/hooks.lua | 10 +++------- SerialICE/simba/i82801.lua | 1 - SerialICE/simba/intel_d845gbv2.lua | 1 - SerialICE/simba/intel_d946gzis.lua | 1 - SerialICE/simba/intel_smbus.lua | 1 - SerialICE/simba/memory.lua | 7 ------- SerialICE/simba/mmio.lua | 2 -- SerialICE/simba/msi_ms7133.lua | 1 - SerialICE/simba/output.lua | 1 - SerialICE/simba/pc80.lua | 13 ------------- SerialICE/simba/pci_cfg.lua | 3 --- SerialICE/simba/superio.lua | 3 --- SerialICE/simba/via_epia_m_850.lua | 1 - 19 files changed, 3 insertions(+), 53 deletions(-) diff --git a/SerialICE/simba/aopen_dxpl_plus.lua b/SerialICE/simba/aopen_dxpl_plus.lua index bc5459c..e8284d3 100644 --- a/SerialICE/simba/aopen_dxpl_plus.lua +++ b/SerialICE/simba/aopen_dxpl_plus.lua @@ -110,7 +110,6 @@ function mainboard_io_post(f, action) end filter_mainboard = { - id = -1, name = "AOpen", pre = mainboard_io_pre, post = mainboard_io_post, diff --git a/SerialICE/simba/asus_p4p800_vm.lua b/SerialICE/simba/asus_p4p800_vm.lua index fbc8c44..e4ed836 100644 --- a/SerialICE/simba/asus_p4p800_vm.lua +++ b/SerialICE/simba/asus_p4p800_vm.lua @@ -62,7 +62,6 @@ function mainboard_io_post(f, action) end filter_mainboard = { - id = -1, name = "test", pre = mainboard_io_pre, post = mainboard_io_post, diff --git a/SerialICE/simba/commell_lv_672.lua b/SerialICE/simba/commell_lv_672.lua index 9ebf6ea..2c7710d 100644 --- a/SerialICE/simba/commell_lv_672.lua +++ b/SerialICE/simba/commell_lv_672.lua @@ -35,7 +35,6 @@ function mainboard_io_post(f, action) end filter_mainboard = { - id = -1, name = "test", pre = mainboard_io_pre, post = mainboard_io_post, diff --git a/SerialICE/simba/conroexfire_esata2.lua b/SerialICE/simba/conroexfire_esata2.lua index 5f8b198..d974d7c 100644 --- a/SerialICE/simba/conroexfire_esata2.lua +++ b/SerialICE/simba/conroexfire_esata2.lua @@ -63,7 +63,6 @@ function mainboard_io_post(f, action) end filter_mainboard = { - id = -1, name = "test", pre = mainboard_io_pre, post = mainboard_io_post, diff --git a/SerialICE/simba/core_io.lua b/SerialICE/simba/core_io.lua index 37db0ea..0aa67fd 100644 --- a/SerialICE/simba/core_io.lua +++ b/SerialICE/simba/core_io.lua @@ -31,7 +31,6 @@ function io_post(f, action) end filter_io_fallback = { - id = -1, name = "IO", pre = io_undefined, post = io_post, @@ -69,7 +68,6 @@ function mem_post(f, action) end filter_mem_fallback = { - id = -1, name = "MEM", pre = mem_undefined, post = mem_post, diff --git a/SerialICE/simba/cpu.lua b/SerialICE/simba/cpu.lua index 9c2c72b..22ccb33 100644 --- a/SerialICE/simba/cpu.lua +++ b/SerialICE/simba/cpu.lua @@ -47,7 +47,6 @@ end filter_cpumsr_fallback = { - id = -1, name = "CPU MSR", pre = cpumsr_pre, post = cpumsr_post, @@ -72,7 +71,6 @@ function cpuid_post(f, action) end filter_cpuid_fallback = { - id = -1, name = "CPUID", pre = cpuid_pre, post = cpuid_post, @@ -98,7 +96,6 @@ function multicore_post(f, action) end filter_multiprocessor = { - id = -1, name = "Multiprocessor Count", pre = multicore_pre, post = multicore_post, @@ -127,7 +124,6 @@ function intel_microcode_post(f, action) end filter_intel_microcode = { - id = -1, name = "Microcode Update", pre = intel_microcode_pre, post = intel_microcode_post, @@ -156,7 +152,6 @@ function amd_microcode_post(f, action) end filter_amd_microcode = { - id = -1, name = "Microcode Update", pre = amd_microcode_pre, post = amd_microcode_post, diff --git a/SerialICE/simba/hooks.lua b/SerialICE/simba/hooks.lua index 29f574a..72e1a55 100644 --- a/SerialICE/simba/hooks.lua +++ b/SerialICE/simba/hooks.lua @@ -39,10 +39,8 @@ function enable_hook(list, filter) l = l.next end if not found then - if (filter.id < 0) then - filter.id = next_filter_id - next_filter_id = next_filter_id + 1 - end + filter.id = next_filter_id + next_filter_id = next_filter_id + 1 list.list = { next = list.list, hook = filter } end if (list == io_hooks) then @@ -71,7 +69,7 @@ function disable_hook(list, filter) printks(froot, "id=%04x disabled\n", filter.id) filter.enable = false else - printks(filter, "disabled\n", filter.id) + printks(filter, "disabled\n") filter.enable = false end end @@ -147,7 +145,6 @@ end function generic_io_bar(bar) if not bar.f then local f = {} - f.id = -1 f.pre = handle_action f.post = io_post f.decode = F_RANGE @@ -167,7 +164,6 @@ end function generic_mmio_bar(bar) if not bar.f then local f = {} - f.id = -1 f.pre = handle_action f.post = mem_post f.decode = F_RANGE diff --git a/SerialICE/simba/i82801.lua b/SerialICE/simba/i82801.lua index a1571f9..96fc8c3 100644 --- a/SerialICE/simba/i82801.lua +++ b/SerialICE/simba/i82801.lua @@ -146,7 +146,6 @@ end -- ICH7 TPM -- Phoenix "Secure" Core bails out if we don't pass the read on ;-) filter_ich7_tpm = { - id = -1, name = "ICH7 TPM", pre = mem_target_only, post = mem_post, diff --git a/SerialICE/simba/intel_d845gbv2.lua b/SerialICE/simba/intel_d845gbv2.lua index 43921ee..1f08dfc 100644 --- a/SerialICE/simba/intel_d845gbv2.lua +++ b/SerialICE/simba/intel_d845gbv2.lua @@ -58,7 +58,6 @@ function mainboard_io_post(f, action) end filter_mainboard = { - id = -1, name = "GEBV2", pre = mainboard_io_pre, post = mainboard_io_post, diff --git a/SerialICE/simba/intel_d946gzis.lua b/SerialICE/simba/intel_d946gzis.lua index ea46ba3..da3338d 100644 --- a/SerialICE/simba/intel_d946gzis.lua +++ b/SerialICE/simba/intel_d946gzis.lua @@ -51,7 +51,6 @@ function mainboard_io_post(f, action) end filter_mainboard = { - id = -1, name = "test", pre = mainboard_io_pre, post = mainboard_io_post, diff --git a/SerialICE/simba/intel_smbus.lua b/SerialICE/simba/intel_smbus.lua index daa0b9d..bfdf384 100644 --- a/SerialICE/simba/intel_smbus.lua +++ b/SerialICE/simba/intel_smbus.lua @@ -236,7 +236,6 @@ end local intel_smbus_host = { - id = -1, name = "i801-smbus", pre = intel_smbus_host_pre, post = intel_smbus_host_post, diff --git a/SerialICE/simba/memory.lua b/SerialICE/simba/memory.lua index 11bc6ed..4e60bad 100644 --- a/SerialICE/simba/memory.lua +++ b/SerialICE/simba/memory.lua @@ -22,7 +22,6 @@ function mem_rom_post(f, action) end filter_rom_low = { - id = -1, name = "ROM_LO", pre = mem_qemu_rom_pre, post = mem_rom_post, @@ -31,7 +30,6 @@ filter_rom_low = { size = 0x20000 } filter_rom_high = { - id = -1, name = "ROM_HI", pre = mem_qemu_rom_pre, post = mem_rom_post, @@ -55,7 +53,6 @@ end function new_car_region(start, size) f = {} - f.id = -1 f.name = "CAR" f.base = start f.size = size @@ -121,7 +118,6 @@ function mem_post_pre_ram_only(f, action) end filter_ram_low = { - id = -1, name = "MEM", pre = mem_ram_low, post = mem_post_pre_ram_only, @@ -131,7 +127,6 @@ filter_ram_low = { } filter_smi_vga = { - id = -1, name = "SMI_VGA", pre = mem_smi_vga, post = mem_post, @@ -141,7 +136,6 @@ filter_smi_vga = { } filter_ram_low_2 = { - id = -1, name = "MEM", pre = mem_ram_low, post = mem_post_pre_ram_only, @@ -164,7 +158,6 @@ end -- need lots of ram on the host and firmware usually does not intensively -- use high memory anyways. filter_ram_high = { - id = -1, name = "MEM", pre = mem_target_only, post = mem_post_pre_ram_only, diff --git a/SerialICE/simba/mmio.lua b/SerialICE/simba/mmio.lua index 681953b..c6ba1e5 100644 --- a/SerialICE/simba/mmio.lua +++ b/SerialICE/simba/mmio.lua @@ -17,7 +17,6 @@ function mem_lapic(f, action) end filter_lapic = { - id = -1, name = "LAPIC", pre = mem_lapic, post = mem_post, @@ -29,7 +28,6 @@ filter_lapic = { -- IOAPIC filter_ioapic = { - id = -1, name = "IOAPIC", pre = mem_target_only, post = mem_post, diff --git a/SerialICE/simba/msi_ms7133.lua b/SerialICE/simba/msi_ms7133.lua index 41bd7bf..039496f 100644 --- a/SerialICE/simba/msi_ms7133.lua +++ b/SerialICE/simba/msi_ms7133.lua @@ -47,7 +47,6 @@ function mainboard_io_post(f, action) end filter_mainboard = { - id = -1, name = "test", pre = mainboard_io_pre, post = mainboard_io_post, diff --git a/SerialICE/simba/output.lua b/SerialICE/simba/output.lua index c006248..fac895d 100644 --- a/SerialICE/simba/output.lua +++ b/SerialICE/simba/output.lua @@ -6,7 +6,6 @@ froot = { } fresource = { - id = -1, name = "Resource", } diff --git a/SerialICE/simba/pc80.lua b/SerialICE/simba/pc80.lua index a9f4f0c..35d01e3 100644 --- a/SerialICE/simba/pc80.lua +++ b/SerialICE/simba/pc80.lua @@ -11,7 +11,6 @@ function debugport_post(f, action) end filter_debugport = { - id = -1, name = "POST", pre = handle_action, post = debugport_post, @@ -52,7 +51,6 @@ function i8259_edge_post(f,action) end filter_i8259_master = { - id = -1, name = "i8259 A", pre = i8259_pre, post = i8259_post, @@ -62,7 +60,6 @@ filter_i8259_master = { } filter_i8259_slave = { - id = -1, name = "i8259 B", pre = i8259_pre, post = i8259_post, @@ -72,7 +69,6 @@ filter_i8259_slave = { } filter_i8259_edge = { - id = -1, name = "i8259 C", pre = i8259_edge_pre, post = i8259_edge_post, @@ -101,7 +97,6 @@ end filter_i8237_a = { - id = -1, name = "i8237 A", pre = i8237_pre, post = i8237_post, @@ -110,7 +105,6 @@ filter_i8237_a = { size = 0x20 } filter_i8237_b = { - id = -1, name = "i8237 B", pre = i8237_pre, post = i8237_post, @@ -119,7 +113,6 @@ filter_i8237_b = { size = 0x20 } filter_i8237_c = { - id = -1, name = "i8237 C", pre = i8237_pre, post = i8237_post, @@ -243,7 +236,6 @@ i8254_counters[0x1] = { init=0, current=0, latch, readback, status=0 } i8254_counters[0x2] = { init=0, current=0, latch, readback, status=0 } filter_i8254_a = { - id = -1, name = "i8254 A", pre = i8254_pre, post = i8254_post, @@ -253,7 +245,6 @@ filter_i8254_a = { counter = i8254_counters, } filter_i8254_b = { - id = -1, name = "i8254 B", pre = i8254_pre, post = i8254_post, @@ -322,7 +313,6 @@ function i8042_post(f, action) end filter_i8042 = { - id = -1, decode = F_FIXED, name = "i8042", pre = i8042_pre, @@ -455,7 +445,6 @@ function nvram_post(f, action) end filter_nvram = { - id = -1, name = "NVram", pre = nvram_pre, post = nvram_post, @@ -493,7 +482,6 @@ function sys_rst_post(f, action) end filter_reset = { - id = -1, name = "Reset", pre = sys_rst_pre, post = sys_rst_post, @@ -515,7 +503,6 @@ function vga_io_post(f, action) end filter_vga_io = { - id = -1, name = "VGA", pre = vga_io_pre, post = vga_io_post, diff --git a/SerialICE/simba/pci_cfg.lua b/SerialICE/simba/pci_cfg.lua index 47a061d..d874e9f 100644 --- a/SerialICE/simba/pci_cfg.lua +++ b/SerialICE/simba/pci_cfg.lua @@ -16,7 +16,6 @@ function add_pci_cfg_hook(dev, reg, size, func) bit32.band(0xff,bit32.rshift(bdfr, 20)), bit32.band(0x1f,bit32.rshift(bdfr, 15)), bit32.band(0x7,bit32.rshift(bdfr, 12)), bit32.band(0xfff,bdfr)) local filter = { - id = -1, base = bdfr, dev = dev, reg = reg, @@ -272,7 +271,6 @@ function pci_io_cfg_post(f, action) end filter_pci_io_cfg = { - id = -1, name = "PCI", pre = pci_io_cfg_pre, post = pci_io_cfg_post, @@ -305,7 +303,6 @@ function pci_mm_cfg_post(f, action) end filter_pci_mm_cfg = { - id = -1, pre = pci_mm_cfg_pre, post = pci_mm_cfg_post, hide = hide_pci_mm_cfg, diff --git a/SerialICE/simba/superio.lua b/SerialICE/simba/superio.lua index 7f6210c..14df145 100644 --- a/SerialICE/simba/superio.lua +++ b/SerialICE/simba/superio.lua @@ -181,7 +181,6 @@ end filter_superio_2e = { - id = -1, name = "PnP", pre = superio_pre, post = superio_post, @@ -193,7 +192,6 @@ filter_superio_2e = { ldn = {}, } filter_superio_4e = { - id = -1, name = "PnP", pre = superio_pre, post = superio_post, @@ -255,7 +253,6 @@ function com_pre(f, action) end filter_com1 = { - id = -1, name = "COM1", pre = com_pre, post = io_post, diff --git a/SerialICE/simba/via_epia_m_850.lua b/SerialICE/simba/via_epia_m_850.lua index e4649c4..b305353 100644 --- a/SerialICE/simba/via_epia_m_850.lua +++ b/SerialICE/simba/via_epia_m_850.lua @@ -96,7 +96,6 @@ function mainboard_io_post(f, action) end filter_mainboard = { - id = -1, name = "VIA", pre = mainboard_io_pre, post = mainboard_io_post,

1 0

New patch to review for serialice: fbd42fc Treat PnP devices as fixed IO
by Kyösti Mälkki March 4, 2013

March 4, 2013

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2577 -gerrit commit fbd42fc657d81ccc6b9a8734222fc007c6238c71 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Mar 3 19:02:29 2013 +0200 Treat PnP devices as fixed IO Usually these ISA/LPC devices are discussed using fixed I/O addresses so change the log output. Sometimes PnP registers are programmed for fixed I/O resources too. We test for 0x60/0x64 as it is filtered with pc80.lua:i8042 instead. Change-Id: Ibec34fe656dea9efd22ab4530ef9efb99c9c665d Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/pc80.lua | 1 + SerialICE/simba/superio.lua | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/SerialICE/simba/pc80.lua b/SerialICE/simba/pc80.lua index 7ce439c..a9f4f0c 100644 --- a/SerialICE/simba/pc80.lua +++ b/SerialICE/simba/pc80.lua @@ -323,6 +323,7 @@ end filter_i8042 = { id = -1, + decode = F_FIXED, name = "i8042", pre = i8042_pre, post = i8042_post, diff --git a/SerialICE/simba/superio.lua b/SerialICE/simba/superio.lua index 1248af5..7f6210c 100644 --- a/SerialICE/simba/superio.lua +++ b/SerialICE/simba/superio.lua @@ -62,8 +62,11 @@ function superio_try_enable_io(f, idx) if not ldn.bar0.name then ldn.bar0.name = superio_pnpdev(f) end - ldn.bar0.val = iobase - generic_io_bar(ldn.bar0) + if iobase ~= 0x60 then + ldn.bar0.val = iobase + generic_io_bar(ldn.bar0) + ldn.bar0.f.decode = F_FIXED + end end if idx == 1 and ldn.set[0x62] and ldn.set[0x63] then local iobase = bit32.bor(bit32.lshift(ldn.data[0x62], 8), ldn.data[0x63]) @@ -73,8 +76,11 @@ function superio_try_enable_io(f, idx) if not ldn.bar1.name then ldn.bar1.name = superio_pnpdev(f) end - ldn.bar1.val = iobase - generic_io_bar(ldn.bar1) + if iobase ~= 0x64 then + ldn.bar1.val = iobase + generic_io_bar(ldn.bar1) + ldn.bar1.f.decode = F_FIXED + end end end end

1 0