the following patch was just integrated into master:
commit 14d052638246f5bc14f96f10d5ec8a07eef9091b
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>
Reviewed-on: http://review.coreboot.org/2596
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Wed Mar 6 21:10:53 2013, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Sat Mar 9 00:41:05 2013, giving +2
See http://review.coreboot.org/2596 for details.
-gerrit
the following patch was just integrated into master:
commit 171629643a17091ef1710825ba7fe38626c5a892
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>
Reviewed-on: http://review.coreboot.org/2595
Tested-by: build bot (Jenkins)
Reviewed-by: Idwer Vollering <vidwer(a)gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Wed Mar 6 21:04:52 2013, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Sat Mar 9 00:40:44 2013, giving +2
See http://review.coreboot.org/2595 for details.
-gerrit
the following patch was just integrated into master:
commit f99e586ae3e022b1435ec8359e09c875fae5b876
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>
Reviewed-on: http://review.coreboot.org/2594
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Wed Mar 6 20:58:51 2013, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Sat Mar 9 00:40:25 2013, giving +2
See http://review.coreboot.org/2594 for details.
-gerrit
the following patch was just integrated into master:
commit e7c3c6d2c4a0e04a34d252d6737faa9f3d7aa474
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>
Reviewed-on: http://review.coreboot.org/2593
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Wed Mar 6 20:52:51 2013, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Sat Mar 9 00:40:08 2013, giving +2
See http://review.coreboot.org/2593 for details.
-gerrit
the following patch was just integrated into master:
commit bea1b121f626311a85dfdd69c649458c1a13f88f
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>
Reviewed-on: http://review.coreboot.org/2580
Tested-by: build bot (Jenkins)
Reviewed-by: Idwer Vollering <vidwer(a)gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Wed Mar 6 20:28:58 2013, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Sat Mar 9 00:39:36 2013, giving +2
See http://review.coreboot.org/2580 for details.
-gerrit
the following patch was just integrated into master:
commit a5a5176c137e22eee9a08e697db15e1665533afb
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>
Reviewed-on: http://review.coreboot.org/2579
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Wed Mar 6 20:40:54 2013, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Sat Mar 9 00:39:23 2013, giving +2
See http://review.coreboot.org/2579 for details.
-gerrit
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 75bf1f3ccddb3c1dc8331279c32a0791c63e733d
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 | 58 ++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 31 deletions(-)
diff --git a/SerialICE/simba/hooks.lua b/SerialICE/simba/hooks.lua
index 4a0d529..c726e8c 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,16 +21,26 @@ 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
- root_info("Attempted to call enable_hook() with filter==nil\n")
+ root_info("Attempted to call enable_hook() with filter==nil\n")
return
end
@@ -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
the following patch was just integrated into master:
commit e663d0803584e301261c8e1a10bd51768e0816c9
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>
Reviewed-on: http://review.coreboot.org/2578
Tested-by: build bot (Jenkins)
Reviewed-by: Idwer Vollering <vidwer(a)gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Wed Mar 6 20:46:52 2013, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Fri Mar 8 00:57:55 2013, giving +2
See http://review.coreboot.org/2578 for details.
-gerrit
