pci: xilinx: Use pci_generic_mmap_{read, write}_config()

[u-boot] / drivers / pci / pci_rom.c

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index cd083f7dde8c8353585416df3fe86b47f50c5a67..46fe5e62471207e9099526413a6e9aa032923dfa 100644 (file)
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -35,8 +35,22 @@
 #include <video_fb.h>
 #include <linux/screen_info.h>
 
+#ifdef CONFIG_X86
+#include <asm/acpi_s3.h>
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
 __weak bool board_should_run_oprom(struct udevice *dev)
 {
+#if defined(CONFIG_X86) && defined(CONFIG_HAVE_ACPI_RESUME)
+       if (gd->arch.prev_sleep_state == ACPI_S3) {
+               if (IS_ENABLED(CONFIG_S3_VGA_ROM_RUN))
+                       return true;
+               else
+                       return false;
+       }
+#endif
+
        return true;
 }
 
@@ -188,47 +202,6 @@ static int pci_rom_load(struct pci_rom_header *rom_header,
 
 struct vbe_mode_info mode_info;
 
-int vbe_get_video_info(struct graphic_device *gdev)
-{
-#ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE
-       struct vesa_mode_info *vesa = &mode_info.vesa;
-
-       gdev->winSizeX = vesa->x_resolution;
-       gdev->winSizeY = vesa->y_resolution;
-
-       gdev->plnSizeX = vesa->x_resolution;
-       gdev->plnSizeY = vesa->y_resolution;
-
-       gdev->gdfBytesPP = vesa->bits_per_pixel / 8;
-
-       switch (vesa->bits_per_pixel) {
-       case 32:
-       case 24:
-               gdev->gdfIndex = GDF_32BIT_X888RGB;
-               break;
-       case 16:
-               gdev->gdfIndex = GDF_16BIT_565RGB;
-               break;
-       default:
-               gdev->gdfIndex = GDF__8BIT_INDEX;
-               break;
-       }
-
-       gdev->isaBase = CONFIG_SYS_ISA_IO_BASE_ADDRESS;
-       gdev->pciBase = vesa->phys_base_ptr;
-
-       gdev->frameAdrs = vesa->phys_base_ptr;
-       gdev->memSize = vesa->bytes_per_scanline * vesa->y_resolution;
-
-       gdev->vprBase = vesa->phys_base_ptr;
-       gdev->cprBase = vesa->phys_base_ptr;
-
-       return gdev->winSizeX ? 0 : -ENOSYS;
-#else
-       return -ENOSYS;
-#endif
-}
-
 void setup_video(struct screen_info *screen_info)
 {
        struct vesa_mode_info *vesa = &mode_info.vesa;
@@ -334,7 +307,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),
                        goto err;
 #endif
        } else {
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) && CONFIG_IS_ENABLED(X86_32BIT_INIT)
                bios_set_interrupt_handler(0x15, int15_handler);
 
                bios_run_on_x86(dev, (unsigned long)ram, vesa_mode,