Kyösti Mälkki (kyosti.malkki@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@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@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,