Alexandru Gagniuc (mr.nuke.me@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3801
-gerrit
commit d3c68a43894abb29f41d8d94915afe2c1fa9e5bc Author: Alexandru Gagniuc mr.nuke.me@gmail.com Date: Mon Jul 22 16:13:25 2013 -0500
VX900: Unify northbridge_vx900 and northbridge_vx900_traf filters
The VX900 is a monolithic chipset, so it does not make sense to treat the south and north modules separately.
Change-Id: I4f7eb686bdc7d5b08cf41317fd10546c156e48cc Signed-off-by: Alexandru Gagniuc mr.nuke.me@gmail.com --- SerialICE/simba/chipset/via_bars.lua | 39 +++++++++++++--------------- SerialICE/simba/mainboard/via_epia_m_850.lua | 1 - 2 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/SerialICE/simba/chipset/via_bars.lua b/SerialICE/simba/chipset/via_bars.lua index 458005e..bafc53b 100644 --- a/SerialICE/simba/chipset/via_bars.lua +++ b/SerialICE/simba/chipset/via_bars.lua @@ -1,24 +1,4 @@
-function sb_mmio_bar(f, action) - -- This MMIO space is used for SPI and CEC control - f.dev.mmio.name = "SB_MMIO" - f.dev.mmio.val = bit32.lshift(bit32.band(action.data, 0xfff0), 8) - f.dev.mmio.size = 0x10000 - - generic_mmio_bar(f.dev.mmio) -end - -dev_sb = { - pci_dev = pci_bdf(0,0x11,0,0), - name = "sb", - bar = {}, - mmio = { f = nil }, -} - -function northbridge_vx900() - pci_cfg32_hook(dev_sb, 0xbc, "SB_MMIO", sb_mmio_bar) -end - dev_nb_traf_ctl = { pci_dev = pci_bdf(0,0,5,0), name = "trf", @@ -37,6 +17,23 @@ function vx900_pcie_bar(f, action) end end
-function northbridge_vx900_traf() +dev_sb = { + pci_dev = pci_bdf(0,0x11,0,0), + name = "sb", + bar = {}, + mmio = { f = nil }, +} + +function sb_mmio_bar(f, action) + -- This MMIO space is used for SPI and CEC control + f.dev.mmio.name = "SB_MMIO" + f.dev.mmio.val = bit32.lshift(bit32.band(action.data, 0xfff0), 8) + f.dev.mmio.size = 0x10000 + + generic_mmio_bar(f.dev.mmio) +end + +function northbridge_vx900() pci_cfg8_hook(dev_nb_traf_ctl, 0x61, "PCI", vx900_pcie_bar) + pci_cfg32_hook(dev_sb, 0xbc, "SB_MMIO", sb_mmio_bar) end diff --git a/SerialICE/simba/mainboard/via_epia_m_850.lua b/SerialICE/simba/mainboard/via_epia_m_850.lua index aa5ebb3..6737399 100644 --- a/SerialICE/simba/mainboard/via_epia_m_850.lua +++ b/SerialICE/simba/mainboard/via_epia_m_850.lua @@ -157,7 +157,6 @@ function do_mainboard_setup() enable_hook_superio(0x4e, 0x07)
northbridge_vx900() - northbridge_vx900_traf() pci_cfg16_hook(dev_power, 0x88, "PM", pm_io_bar) pci_cfg16_hook(dev_power, 0xd0, "SMBus", smbus_bar_hook)