[OpenBIOS] [PATCH] pci: only try and detect Mac driver in PCI ROM for PPC machines

Mark Cave-Ayland mark.cave-ayland at ilande.co.uk
Fri Sep 9 14:55:21 CEST 2016


It seems that the VGA option ROM isn't mapped on SPARC64 which causes
a fault upon access.

Temporarily handle this by surrounding the code in #ifdef CONFIG_PPC
guards until the proper solution can be implemented.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>
---
 drivers/pci.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/pci.c b/drivers/pci.c
index eec6a20..4e4e9ae 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -773,13 +773,15 @@ int macio_keylargo_config_cb (const pci_config_t *config)
 
 int vga_config_cb (const pci_config_t *config)
 {
+#ifdef CONFIG_PPC
         unsigned long rom;
         uint32_t rom_size, size, bar;
         phandle_t ph;
-
+#endif
         if (config->assigned[0] != 0x00000000) {
             setup_video();
 
+#ifdef CONFIG_PPC
             if (config->assigned[6]) {
                     rom = pci_bus_addr_to_host_addr(MEMORY_SPACE_32,
                                                     config->assigned[6] & ~0x0000000F);
@@ -805,6 +807,8 @@ int vga_config_cb (const pci_config_t *config)
                             }
                     }
             }
+#endif
+
             /* Currently we don't read FCode from the hardware but execute
              * it directly */
             feval("['] vga-driver-fcode 2 cells + 1 byte-load");
-- 
1.7.10.4




More information about the OpenBIOS mailing list