Merge remote-tracking branch 'upstream/master' into 64-bit-BARs

2023-02-02 21:14:05 -08:00 · 2023-02-02 21:14:05 -08:00 · 8862a73ef1
parent 2a64f547cc 5e61b473f0
commit 8862a73ef1
1 changed files with 2 additions and 2 deletions
--- a/devices/memctrl/mpc106.cpp
+++ b/devices/memctrl/mpc106.cpp
@ -91,11 +91,11 @@ uint32_t MPC106::read(uint32_t rgn_start, uint32_t offset, int size) {
        if (offset >= 0x200000) {
            if (this->config_addr & 0x80)    // process only if bit E (enable) is set
                return pci_read(offset, size);
+        } else {
+            return this->config_addr;
        }
    }

-    // FIXME: reading from CONFIG_ADDR is ignored for now
-
    return 0;
 }