commit 84c30caa7c64b5bb73f51d0f5ad4dc4d0ae40fd3
author Helge Deller <deller@gmx.de> Tue Apr 02 14:32:14 2024 +0200
committer Helge Deller <deller@gmx.de> Wed May 15 15:50:06 2024 +0200
tree d0dd218caf1cf6798e76bf559001a7d61c06d566
parent dd4b770d47ff7888eb438526928bd9b84e6a9922

parisc: Fix LMMIO detection for PCI cards on Astro/Elroy

PCI graphic cards allocate LMMIO memory. Allow PDC_ADD_VALID to
accept this memory.

Signed-off-by: Helge Deller <deller@gmx.de>

src/parisc/parisc.c

diff --git a/src/parisc/parisc.c b/src/parisc/parisc.c
index 8ede027..8aec3bc 100644
--- a/src/parisc/parisc.c
+++ b/src/parisc/parisc.c
@@ -444,14 +444,16 @@
 {
     if (!has_astro)
         return 0;
-    return ((hpa - IOS_DIST_BASE_ADDR) < IOS_DIST_BASE_SIZE);
+    return ((F_EXTEND(hpa) - F_EXTEND(IOS_DIST_BASE_ADDR))
+            < IOS_DIST_BASE_SIZE);
 }
 
 int HPA_is_astro_mmio(unsigned long hpa)
 {
     if (!has_astro)
         return 0;
-    return ((hpa - LMMIO_DIST_BASE_ADDR) < LMMIO_DIST_BASE_SIZE);
+    return (F_EXTEND(hpa) - F_EXTEND(LMMIO_DIST_BASE_ADDR))
+            < (IOS_DIST_BASE_ADDR - LMMIO_DIST_BASE_SIZE);
 }
 
 struct pci_device *find_pci_from_HPA(unsigned long hpa)
@@ -468,10 +470,10 @@
         return NULL;
 
     foreachpci(pci) {
+        unsigned long mem;
         int i;
         for (i = 0; i < 6; i++) {
             unsigned long addr = PCI_BASE_ADDRESS_0 + 4*i;
-            unsigned long mem;
             mem = pci_config_readl(pci->bdf, addr);
             if ((mem & PCI_BASE_ADDRESS_SPACE_IO) &&
                 ((mem & PCI_BASE_ADDRESS_IO_MASK) == hpa) &&
@@ -482,6 +484,11 @@
                 (ioport == 0))
                     return pci;     /* found memaddr */
         }
+        mem = pci_config_readl(pci->bdf, PCI_ROM_ADDRESS) & PCI_ROM_ADDRESS_MASK;
+        mem = F_EXTEND(mem);
+        // dprintf(1, "PCI ROM INFO for HPA %lx  mem %lx\n", hpa, mem);
+        if (hpa >= mem && hpa < (mem + 4 * PAGE_SIZE))
+            return pci; /* found ROM */
     }
     dprintf(1, "No PCI device found for HPA %lx\n", hpa);
     return NULL;
@@ -1862,7 +1869,7 @@
     unsigned long arg2 = is_compat_mode() ? COMPAT_VAL(ARG2) : ARG2;
 
     NO_COMPAT_RETURN_VALUE(ARG2);
-    // dprintf(0, "\n\nSeaBIOS: PDC_ADD_VALID function %ld arg2=%x called.\n", option, arg2);
+    // dprintf(0, "\n\nSeaBIOS: PDC_ADD_VALID function %ld arg2=%lx called.\n", option, arg2);
     if (option != 0)
         return PDC_BAD_OPTION;
     if (0 && arg2 == 0) // should PAGE0 be valid?  HP-UX asks for it, but maybe due a bug in our code...
@@ -1879,6 +1886,8 @@
         return PDC_OK;
     if (find_hpa_device(arg2))
         return PDC_OK;
+    if (find_pci_from_HPA(arg2))
+        return PDC_OK;
     dprintf(0, "\n\nSeaBIOS: FAILED!!!! PDC_ADD_VALID function %ld arg2=%lx called.\n", option, arg2);
     return PDC_REQ_ERR_0; /* Operation completed with a requestor bus error. */
 }