SerialICE March 2013

serialice@serialice.com

1 participants
54 discussions

New patch to review for serialice: fcd8a6c Refactor matching filters to actions
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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/2598 -gerrit commit fcd8a6c3c5080464a16bcf939dc31bc9210b319a Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Wed Mar 6 20:19:27 2013 +0200 Refactor matching filters to actions Each hooks list has some criteria when an action matches a filter. For memory and IO, the action address must be within the range of an enabled filter. For CPUID and MSR, the filter must be enabled, and the filter internally checks the index parameters. Change-Id: I6f035a0a39d1f94dc77e1b1dc16459b071ca871a Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/hooks.lua | 56 ++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/SerialICE/simba/hooks.lua b/SerialICE/simba/hooks.lua index 4a0d529..8877cd7 100644 --- a/SerialICE/simba/hooks.lua +++ b/SerialICE/simba/hooks.lua @@ -3,8 +3,8 @@ froot = { id = 0, name = "SerialICE" } fresource = { id = 1, name = "Resource" } -function new_hooks(str) - return { list = nil, name = str } +function new_hooks(str, rule) + return { list = nil, name = str, match_filter = rule } end next_filter_id = 2 @@ -21,12 +21,22 @@ function new_parent_action() current_parent_id = action_id() end +function filter_in_range(f, action) + if f.enable and action.addr >= f.base and action.addr < f.base + f.size then + return true + end + return false +end + +function filter_enabled(f, action) + return f.enable +end -io_hooks = new_hooks("IO") -mem_hooks = new_hooks("MEM") +io_hooks = new_hooks("IO", filter_in_range) +mem_hooks = new_hooks("MEM", filter_in_range) -cpumsr_hooks = new_hooks("CPU MSR") -cpuid_hooks = new_hooks("CPUID") +cpumsr_hooks = new_hooks("CPU MSR", filter_enabled) +cpuid_hooks = new_hooks("CPUID", filter_enabled) function enable_hook(list, filter) if not filter then @@ -76,21 +86,14 @@ function walk_pre_hooks(list, action) local l = list.list local f = nil - local no_base_check = true - if list == io_hooks or list == mem_hooks then - no_base_check = false - end - while l and not logged do f = l.hook - if no_base_check or action.addr >= f.base and action.addr < f.base + f.size then - if f.enable and f.pre then - if f.pre(f, action) then - if not f.raw then - action.logged_pre = f - end - logged = true + if list.match_filter(f, action) then + if f.pre and f.pre(f, action) then + if not f.raw then + action.logged_pre = f end + logged = true end end l = l.next @@ -113,21 +116,14 @@ function walk_post_hooks(list, action) local l = list.list local f = nil - local no_base_check = true - if list == io_hooks or list == mem_hooks then - no_base_check = false - end - while l and not logged do f = l.hook - if no_base_check or action.addr >= f.base and action.addr < f.base + f.size then - if f.enable and f.post then - if f.post(f, action) then - if not f.raw then - action.logged_post = f - end - logged = false + if list.match_filter(f, action) then + if f.post and f.post(f, action) then + if not f.raw then + action.logged_post = f end + logged = false end end l = l.next

1 0

New patch to review for serialice: 10c41b5 Only log Raw action lines from Qemu session
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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/2597 -gerrit commit 10c41b5ed7c5718821bde96903e4a97fd12cf241 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Mar 5 09:40:28 2013 +0200 Only log Raw action lines from Qemu session The only lines a qemu session with SerialICE needs to write in the output are those produced with the core filters and marked with the flag Raw "R...". Everything else can be replayed from these. This is a principal change: the output of Qemu session is now completely raw and one must pass the logfile thru replayer to have simplified view. Change-Id: I6e4eebde41ca46072c545c02eabac848113bb5ee Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/core_io.lua | 4 ++-- SerialICE/simba/cpu.lua | 4 +++- SerialICE/simba/hooks.lua | 24 ++++++++++++------------ SerialICE/simba/output.lua | 37 +++++++++++++++++++++++++++++++------ SerialICE/simba/replay.lua | 9 +-------- SerialICE/simba/serialice.lua | 4 ++-- SerialICE/simba/smbus_host.lua | 1 - 7 files changed, 51 insertions(+), 32 deletions(-) diff --git a/SerialICE/simba/core_io.lua b/SerialICE/simba/core_io.lua index 0aa67fd..08ae42e 100644 --- a/SerialICE/simba/core_io.lua +++ b/SerialICE/simba/core_io.lua @@ -8,7 +8,6 @@ F_RANGE = 2 function io_undefined(f, action) action.to_hw = true action.to_qemu = false - action.undefined = true return true end @@ -32,6 +31,7 @@ end filter_io_fallback = { name = "IO", + raw = true, pre = io_undefined, post = io_post, decode = F_FIXED, @@ -45,7 +45,6 @@ filter_io_fallback = { function mem_undefined(f, action) action.to_hw = true action.to_qemu = false - action.undefined = true return true end @@ -69,6 +68,7 @@ end filter_mem_fallback = { name = "MEM", + raw = true, pre = mem_undefined, post = mem_post, decode = F_FIXED, diff --git a/SerialICE/simba/cpu.lua b/SerialICE/simba/cpu.lua index 6dad741..02839a9 100644 --- a/SerialICE/simba/cpu.lua +++ b/SerialICE/simba/cpu.lua @@ -72,6 +72,7 @@ end filter_cpumsr_fallback = { name = "CPU MSR", + raw = true, pre = cpumsr_pre, post = cpumsr_post, } @@ -96,6 +97,7 @@ end filter_cpuid_fallback = { name = "CPUID", + raw = true, pre = cpuid_pre, post = cpuid_post, } @@ -114,7 +116,7 @@ function multicore_post(f, action) if not action.write and rin.eax == 0x01 then rout.ebx = bit32.band(0xff00ffff, rout.ebx); rout.ebx = bit32.bor(0x00010000, rout.ebx); - fake_action(f, action, 0) + return fake_action(f, action, 0) end return skip_filter(f, action) end diff --git a/SerialICE/simba/hooks.lua b/SerialICE/simba/hooks.lua index 01aea65..4a0d529 100644 --- a/SerialICE/simba/hooks.lua +++ b/SerialICE/simba/hooks.lua @@ -85,12 +85,16 @@ function walk_pre_hooks(list, action) f = l.hook if no_base_check or action.addr >= f.base and action.addr < f.base + f.size then if f.enable and f.pre then - logged = f.pre(f, action) + if f.pre(f, action) then + if not f.raw then + action.logged_pre = f + end + logged = true + end end end l = l.next end - if prev_filter ~= f and not action.ignore then prev_filter = f new_parent_action() @@ -118,15 +122,11 @@ function walk_post_hooks(list, action) f = l.hook if no_base_check or action.addr >= f.base and action.addr < f.base + f.size then if f.enable and f.post then - if no_base_check then - -- cpuid or cpumsr - logged = f.post(f, action) - else - -- io or mem - if f.post(f, action) then - action.f = f - logged = f.hide and not log_everything + if f.post(f, action) then + if not f.raw then + action.logged_post = f end + logged = false end end end @@ -218,9 +218,9 @@ function pre_action(action, dir_wr, addr, size, data) action.my_id = 0 -- no filter, not filtered - action.f = nil + action.logged_pre = nil + action.logged_post = nil action.ignore = false - action.undefined = false action.faked = false action.dropped = false action.to_hw = false diff --git a/SerialICE/simba/output.lua b/SerialICE/simba/output.lua index 10977ea..889dcc1 100644 --- a/SerialICE/simba/output.lua +++ b/SerialICE/simba/output.lua @@ -12,7 +12,21 @@ end function printk(f, action, fmt, ...) local str = "" - if action.undefined or action.f or action == cpu_action then + + -- For Qemu runs only Raw actions are logged + if not replaying and not f.raw then + return + end + + -- For replays, a post filter prevents further lines for the + -- same action from printing if it has property hide set. + if replaying and not log_everything then + if action.logged_post and action.logged_post.hide then + return + end + end + + if f.raw then str = str .. "R" elseif action.info_only then str = str .. "I" @@ -29,7 +43,7 @@ function printk(f, action, fmt, ...) else str = str .. "." end - if action.undefined then + if f.raw and not (action.logged_pre or action.logged_post) then str = str .. "U" elseif action.dropped then str = str .. "D" @@ -41,12 +55,23 @@ function printk(f, action, fmt, ...) print_address(action.parent_id, action.my_id, str, action.cs, action.eip) - if action.f then - printf("%s,%s: ", f.name, action.f.name) - printf(fmt, ...) - else + if not replaying then printf("%s: ", f.name) printf(fmt, ...) + else + if not f.raw then + printf("%s: ", f.name) + printf(fmt, ...) + elseif action.logged_post then + printf("%s: ", action.logged_post.name) + printf(fmt, ...) + elseif action.logged_pre then + printf("%s: ", action.logged_pre.name) + printf(fmt, ...) + else + printf("%s: ", f.name) + printf(fmt, ...) + end end end diff --git a/SerialICE/simba/replay.lua b/SerialICE/simba/replay.lua index 3ac0434..4632c05 100644 --- a/SerialICE/simba/replay.lua +++ b/SerialICE/simba/replay.lua @@ -1,5 +1,5 @@ -local verbose_log = false +replaying = true function SerialICE_register_physical() end @@ -176,8 +176,6 @@ function parse_headers() found, _, board = string.find(line, "SerialICE: Mainboard...:%s+(.+)") if found then SerialICE_mainboard = board - io.write(line) - io.write("\n") end end if string.find(line, "LUA script initialized.") then @@ -267,11 +265,6 @@ function parse_file() end parse_headers() - dofile("serialice.lua") - --- set logging -log_everything = verbose_log - parse_file() diff --git a/SerialICE/simba/serialice.lua b/SerialICE/simba/serialice.lua index 7cabf67..434556f 100644 --- a/SerialICE/simba/serialice.lua +++ b/SerialICE/simba/serialice.lua @@ -68,6 +68,8 @@ dofile("pc80.lua") dofile("superio.lua") dofile("mmio.lua") +io.write("SerialICE: LUA script initialized.\n") + function do_minimal_setup() enable_hook(io_hooks, filter_io_fallback) enable_hook(mem_hooks, filter_mem_fallback) @@ -106,7 +108,5 @@ else do_default_setup() end -root_info("LUA script initialized.\n") - return true diff --git a/SerialICE/simba/smbus_host.lua b/SerialICE/simba/smbus_host.lua index a407843..161bc42 100644 --- a/SerialICE/simba/smbus_host.lua +++ b/SerialICE/simba/smbus_host.lua @@ -186,7 +186,6 @@ local function dump_transaction(f, action) end if signal_in(f, SIG_TIMEOUT) then - action.undefined = true dump = dump .. " (TIMEOUT) " end

1 0

New patch to review for serialice: abf616c Fix variable MTRR filter
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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/2596 -gerrit commit abf616c01e81c21084fe7112cd6a4f1545b6c268 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Wed Mar 6 20:00:11 2013 +0200 Fix variable MTRR filter Separate this from the MSR fallback filter. This filter is not enabled by default and was actually broken because it did not check correctly for the MSR index. Change-Id: I83caabe38070bf45a534585f1243bc2fe9f0c724 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/cpu.lua | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/SerialICE/simba/cpu.lua b/SerialICE/simba/cpu.lua index 22ccb33..6dad741 100644 --- a/SerialICE/simba/cpu.lua +++ b/SerialICE/simba/cpu.lua @@ -2,11 +2,14 @@ -- CPU MSR filters function var_mtrr_post(f, action) - local addr = action.rin.ecx local hi = action.rin.edx local lo = action.rin.eax + if not action.write then + return true + end + if addr % 2 == 0 then mt = lo % 0x100 if mt == 0 then memtype = "Uncacheable" @@ -25,8 +28,32 @@ function var_mtrr_post(f, action) end printk(f, action, "Set MTRR %x mask to %08x.%08x (%s)\n", (addr - 0x200) / 2, hi, bit32.band(lo, 0xfffff000), valid) end + return true +end + +function mtrr_pre(f, action) + local addr = action.rin.ecx + if addr >= 0x200 and addr < 0x210 then + return handle_action(f, action) + end + return false end +function mtrr_post(f, action) + local addr = action.rin.ecx + if addr >= 0x200 and addr < 0x210 then + return var_mtrr_post(f, action) + end + return false +end + +filter_mtrr = { + name = "MTRR", + pre = mtrr_pre, + post = mtrr_post, + hide = true, +} + function cpumsr_pre(f, action) return handle_action(f, action) end @@ -35,9 +62,6 @@ function cpumsr_post(f, action) if action.write then printk(f, action, "[%08x] <= %08x.%08x\n", action.rin.ecx, action.rin.edx, action.rin.eax) - if action.addr >= 0x200 and action.addr < 0x210 then - var_mtrr_post(f, action) - end else printk(f, action, "[%08x] => %08x.%08x\n", action.rin.ecx, action.rout.edx, action.rout.eax)

1 0

New patch to review for serialice: 32d7438 Fix flag combinations
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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/2595 -gerrit commit 32d7438bc4086c2a120b4b429a7e6c471d65072b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Wed Mar 6 19:53:09 2013 +0200 Fix flag combinations In some rare case writes go to both hardware and qemu, so put those at different columns. Only one of "Undefined, Dropped or Faked" is possible at a time, place them on same column. Change-Id: I9b891e44ca1f044c68c21021599fa3a0f8dbae9e Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/output.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SerialICE/simba/output.lua b/SerialICE/simba/output.lua index a01e074..10977ea 100644 --- a/SerialICE/simba/output.lua +++ b/SerialICE/simba/output.lua @@ -21,17 +21,17 @@ function printk(f, action, fmt, ...) end if action.to_hw then str = str .. "H" - elseif action.to_qemu then - str = str .. "Q" else str = str .. "." end - if action.undefined then - str = str .. "U" + if action.to_qemu then + str = str .. "Q" else str = str .. "." end - if action.dropped then + if action.undefined then + str = str .. "U" + elseif action.dropped then str = str .. "D" elseif action.faked then str = str .. "F"

1 0

New patch to review for serialice: 15ee1c0 Fix output from superio filter
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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/2594 -gerrit commit 15ee1c0e544e82b825abc018d744b9f19ee8a290 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Wed Mar 6 07:40:16 2013 +0200 Fix output from superio filter Do not use printf() directly, it could create orphaned lines without processed flags [RH..] or CS:EIP. Change-Id: I7c720792564d64790987814c600bb2e3830a5332 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/superio.lua | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/SerialICE/simba/superio.lua b/SerialICE/simba/superio.lua index 14df145..7d6252c 100644 --- a/SerialICE/simba/superio.lua +++ b/SerialICE/simba/superio.lua @@ -32,23 +32,27 @@ function superio_pnpdev(f) return string.format("%s %02x:%02x", f.name, f.base, f.pnp.active_ldn) end -function superio_dev_post(f, action) +function superio_string(f) if f.pnp.reg < 0x30 then - printk(f, action, "%02x: ", f.base) + return string.format("%02x: ", f.base) else - printk(f, action, "%02x:%02x ", f.base, f.pnp.active_ldn) + return string.format("%02x:%02x ", f.base, f.pnp.active_ldn) end end function superio_register_post(f, action) - superio_dev_post(f, action) + local str = superio_string(f) if action.write then - printf("[%02x] <= %02x\n", f.pnp.reg, action.data) + printk(f, action, "%s [%02x] <= %02x\n", str, f.pnp.reg, action.data) else - printf("[%02x] => %02x\n", f.pnp.reg, action.data) + printk(f, action, "%s [%02x] => %02x\n", str, f.pnp.reg, action.data) end end +function superio_string_post(f, action, str2) + printk(f, action, "%s %s\n", superio_string(f), str2) +end + function superio_try_enable_io(f, idx) local ldn = f.ldn[f.pnp.active_ldn] @@ -89,11 +93,9 @@ function superio_try_enable_ldn(f, action) local ldn = f.ldn[f.pnp.active_ldn] if ldn.set[0x30] and ldn.data[0x30] == 0x0 then - superio_dev_post(f, action) - printf("disabled\n") + superio_string_post(f, action, "disabled") else - superio_dev_post(f, action) - printf("enabled\n") + superio_string_post(f, action, "enabled") end end @@ -165,13 +167,11 @@ function superio_post(f, action) end if f.pnp.reg == 0x70 then - superio_dev_post(f, action) - printf("irq = %d\n", ldn.data[0x70]) + superio_string_post(f, action, string.format("irq = %d", ldn.data[0x70])) return true end if f.pnp.reg == 0x72 then - superio_dev_post(f, action) - printf("irq2 = %d\n", ldn.data[0x72]) + superio_string_post(f, action, string.format("irq2 = %d", ldn.data[0x72])) return true end

1 0

New patch to review for serialice: 4540b21 Add CPUID and MSR replayer
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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/2593 -gerrit commit 4540b218ef4dfef245f6b040e1d127eb791c21ef Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Wed Mar 6 18:16:53 2013 +0200 Add CPUID and MSR replayer Previously replayer just copied the lines for CPUID and RDMSR/WRMSR from the log of Qemu run. Change-Id: I7230e86e8895f49516f18dbecd45e229c54dadc9 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- SerialICE/simba/replay.lua | 70 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/SerialICE/simba/replay.lua b/SerialICE/simba/replay.lua index 1f17f00..3ac0434 100644 --- a/SerialICE/simba/replay.lua +++ b/SerialICE/simba/replay.lua @@ -32,6 +32,25 @@ function replay_mem(dir_wr, addr, size, data) walk_post_hooks(mem_hooks, mem_action) end +function replay_msr(dir_wr, addr, hi, lo) + pre_action(cpu_action, dir_wr, 0, 0, 0) + load_regs(cpu_action.rin, lo, 0, addr, hi) + walk_pre_hooks(cpumsr_hooks, cpu_action) + post_action(cpu_action, 0) + load_regs(cpu_action.rout, lo, 0, addr, hi) + walk_post_hooks(cpumsr_hooks, cpu_action) +end + +function replay_cpuid(idx0, idx1, eax, ebx, ecx, edx) + pre_action(cpu_action, CPUID, 0, 0, 0) + load_regs(cpu_action.rin, idx0, 0, idx1, 0) + walk_pre_hooks(cpuid_hooks, cpu_action) + post_action(cpu_action, 0) + load_regs(cpu_action.rout, eax, ebx, ecx, edx) + walk_post_hooks(cpuid_hooks, cpu_action) +end + + function replay_unknown(str) local dummy = {} pre_action(dummy, false, 0, 0, 0) @@ -77,6 +96,50 @@ function parse_mem(line) return true end +function parse_cpumsr(line) + local msr_op = "CPU MSR%:%s+%[(%x+)%]%s+(<?=>?)%s+(%x+).(%x+)" + local msr_op_old = "CPU%:%s+[:rdw:]*msr%s+(%x+)%s+(<?=>?)%s+(%x+).(%x+)" + local found, ecx, dir, edx, eax + found, _, ecx, dir, edx, eax = string.find(line, msr_op) + if not found then + found, _, ecx, dir, edx, eax = string.find(line, msr_op_old) + end + if not found then + return false + end + local necx = tonumber(ecx, 16) + local nedx = tonumber(edx, 16) + local neax = tonumber(eax, 16) + if string.find("<=", dir) then + replay_msr(true, necx, nedx, neax) + else + replay_msr(false, necx, nedx, neax) + end + return true +end + +function parse_cpuid(line) + local id_op = "CPUID%: eax%: (%x+)%; ecx%: (%x+) => (%x+).(%x+).(%x+).(%x+)" + local id_op_old = "CPU%: CPUID eax%: (%x+)%; ecx%: (%x+) => (%x+).(%x+).(%x+).(%x+)" + local found, idx0, idx1, eax, ebx, ecx, edx + found, _, idx0, idx1, eax, ebx, ecx, edx = string.find(line, id_op) + if not found then + found, _, idx0, idx1, eax, ebx, ecx, edx = string.find(line, id_op_old) + end + if not found then + return false + end + local nidx0 = tonumber(idx0, 16) + local nidx1 = tonumber(idx1, 16) + local neax = tonumber(eax, 16) + local nebx = tonumber(ebx, 16) + local necx = tonumber(ecx, 16) + local nedx = tonumber(edx, 16) + replay_cpuid(nidx0, nidx1, neax, nebx, necx, nedx) + return true +end + + -- Old script already parsed PCI config, synthesize those IOs back. function parse_pci(line) local found, bus, dev, fn, reg, dir, data @@ -191,7 +254,12 @@ function parse_file() if not found then found = parse_mem(str) end - -- TODO: replay CPU MSR and CPUID lines + if not found then + found = parse_cpuid(str) + end + if not found then + found = parse_cpumsr(str) + end if not found then found = replay_unknown(str) end

1 0

Patch set updated for serialice: b144de9 Drop initial value of filter id
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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 b144de957420c7ac874a0618173ffd58c636c618 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

Patch set updated for serialice: 26fa5fa Refactor logging functions
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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 26fa5fae6d632fa918b1933b182647c511987f92 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..01aea65 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("Attempted to call enable_hook() 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

Patch set updated for serialice: 03bea52 Treat PnP devices as fixed IO
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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 03bea525ad9c9fa3b5b0c8ffb83717d454fd1cbf 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. In example below, superio 2e:05 IO base registers for keyboard are programmed with 0x60 and 0x64 and that effectively disables the i8042 filter. We explicitly prevent this pair of addresses from being treated as PnP device. 0028.0029 RH.. [0000:0000] IO,i8042: outb 0064 <= d1 0028.002a RH.. [0000:0000] IO,i8042: inb 0064 => 11 0028.002b .H.. [0000:0000] i8042: A20 enabled 0028.002b RH.. [0000:0000] IO,i8042: outb 0060 <= df 0028.002c RH.. [0000:0000] IO,i8042: inb 0064 => 11 ... 0000.0000 I... [0000:0000] Resource: [0033] IO [0060-0060] = PnP 2e:05 0000.0000 I... [0000:0000] Resource: [0034] IO [0064-0064] = PnP 2e:05 ... 0706.0707 .H.. [0000:0000] PnP 2e:05: [0000] <= d1 0706.0708 .H.. [0000:0000] PnP 2e:05: [0000] => ff 0709.070a .H.. [0000:0000] PnP 2e:05: [0000] <= df 070b.070c .H.. [0000:0000] PnP 2e:05: [0000] => ff 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

Patch set updated for serialice: 25cea14 Do not add RAM filters on default_setup()
by Kyösti Mälkki 06 Mar '13

06 Mar '13

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 25cea143bd7c0ea477f115e51dfa319dde02d40d 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SerialICE March 2013