New patch to review for serialice: fbd42fc Treat PnP devices as fixed IO

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) 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 
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 
---
 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