X86: Compute PCI config addresses correctly.

2009-02-01 00:11:49 -08:00
parent 483c3e96b7
commit 06cdbe5ea7
1 changed files with 2 additions and 1 deletions
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -547,7 +547,8 @@ TLB::translate(RequestPtr &req, ThreadContext *tc, bool write, bool execute)
                    tc->readMiscRegNoEffect(MISCREG_PCI_CONFIG_ADDRESS);
                if (bits(configAddress, 31, 31)) {
                    req->setPaddr(PhysAddrPrefixPciConfig |
-                            bits(configAddress, 30, 0));
+                            mbits(configAddress, 30, 2) |
+                            (IOPort & mask(2)));
                }
            } else {
                req->setPaddr(PhysAddrPrefixIO | IOPort);