x86: Make coreboot sysinfo available to any x86 board

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

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 2cede1211bbed341986d6bd1d999c3b83a052bbd..a14a4db3c2f17448fc82935fa7b5b9213bafbf88 100644 (file)
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -22,22 +22,26 @@
  * Copyright 1997 -- 1999 Martin Mares <[email protected]>
  */
 
+#define LOG_CATEGORY UCLASS_PCI
+
 #include <common.h>
 #include <bios_emul.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
+#include <log.h>
 #include <malloc.h>
 #include <pci.h>
 #include <pci_rom.h>
 #include <vbe.h>
 #include <video.h>
 #include <video_fb.h>
+#include <acpi/acpi_s3.h>
+#include <asm/global_data.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)
 {
@@ -65,7 +69,7 @@ __weak uint32_t board_map_oprom_vendev(uint32_t vendev)
 
 static int pci_rom_probe(struct udevice *dev, struct pci_rom_header **hdrp)
 {
-       struct pci_child_platdata *pplat = dev_get_parent_platdata(dev);
+       struct pci_child_plat *pplat = dev_get_parent_plat(dev);
        struct pci_rom_header *rom_header;
        struct pci_rom_data *rom_data;
        u16 rom_vendor, rom_device;
@@ -233,7 +237,7 @@ void setup_video(struct screen_info *screen_info)
 int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),
                        int exec_method)
 {
-       struct pci_child_platdata *pplat = dev_get_parent_platdata(dev);
+       struct pci_child_plat *pplat = dev_get_parent_plat(dev);
        struct pci_rom_header *rom = NULL, *ram = NULL;
        int vesa_mode = -1;
        bool emulate, alloced;
@@ -325,7 +329,7 @@ err:
 #ifdef CONFIG_DM_VIDEO
 int vbe_setup_video_priv(struct vesa_mode_info *vesa,
                         struct video_priv *uc_priv,
-                        struct video_uc_platdata *plat)
+                        struct video_uc_plat *plat)
 {
        if (!vesa->x_resolution)
                return log_msg_ret("No x resolution", -ENXIO);
@@ -343,7 +347,16 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa,
        default:
                return -EPROTONOSUPPORT;
        }
-       plat->base = vesa->phys_base_ptr;
+
+       /* Use double buffering if enabled */
+       if (IS_ENABLED(CONFIG_VIDEO_COPY)) {
+               if (!plat->base)
+                       return log_msg_ret("copy", -ENFILE);
+               plat->copy_base = vesa->phys_base_ptr;
+       } else {
+               plat->base = vesa->phys_base_ptr;
+       }
+       log_debug("base = %lx, copy_base = %lx\n", plat->base, plat->copy_base);
        plat->size = vesa->bytes_per_scanline * vesa->y_resolution;
 
        return 0;
@@ -351,7 +364,7 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa,
 
 int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void))
 {
-       struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+       struct video_uc_plat *plat = dev_get_uclass_plat(dev);
        struct video_priv *uc_priv = dev_get_uclass_priv(dev);
        int ret;
 
@@ -371,6 +384,15 @@ int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void))
 
        ret = vbe_setup_video_priv(&mode_info.vesa, uc_priv, plat);
        if (ret) {
+               if (ret == -ENFILE) {
+                       /*
+                        * See video-uclass.c for how to set up reserved memory
+                        * in your video driver
+                        */
+                       log_err("CONFIG_VIDEO_COPY enabled but driver '%s' set up no reserved memory\n",
+                               dev->driver->name);
+               }
+
                debug("No video mode configured\n");
                return ret;
        }