Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / drivers / pci / pci_auto.c

diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index a7af8cb..0412bf3 100644 (file)
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -14,12 +14,6 @@
 #include <errno.h>
 #include <pci.h>
 
-#ifdef DEBUG
-#define DEBUGF(x...) printf(x)
-#else
-#define DEBUGF(x...)
-#endif /* DEBUG */
-
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
 #ifndef CONFIG_SYS_PCI_CACHE_LINE_SIZE
 #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 8
@@ -50,20 +44,21 @@ int pciauto_region_allocate(struct pci_region *res, pci_size_t size,
        pci_addr_t addr;
 
        if (!res) {
-               DEBUGF("No resource");
+               debug("No resource");
                goto error;
        }
 
        addr = ((res->bus_lower - 1) | (size - 1)) + 1;
 
        if (addr - res->bus_start + size > res->size) {
-               DEBUGF("No room in resource");
+               debug("No room in resource");
                goto error;
        }
 
        res->bus_lower = addr + size;
 
-       DEBUGF("address=0x%llx bus_lower=0x%llx", (u64)addr, (u64)res->bus_lower);
+       debug("address=0x%llx bus_lower=0x%llx", (unsigned long long)addr,
+             (unsigned long long)res->bus_lower);
 
        *bar = addr;
        return 0;
@@ -87,13 +82,14 @@ void pciauto_setup_device(struct pci_controller *hose,
        pci_size_t bar_size;
        u16 cmdstat = 0;
        int bar, bar_nr = 0;
+#ifndef CONFIG_PCI_ENUM_ONLY
        u8 header_type;
        int rom_addr;
-#ifndef CONFIG_PCI_ENUM_ONLY
        pci_addr_t bar_value;
        struct pci_region *bar_res;
        int found_mem64 = 0;
 #endif
+       u16 class;
 
        pci_hose_read_config_word(hose, dev, PCI_COMMAND, &cmdstat);
        cmdstat = (cmdstat & ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) | PCI_COMMAND_MASTER;
@@ -122,7 +118,8 @@ void pciauto_setup_device(struct pci_controller *hose,
                        bar_res = io;
 #endif
 
-                       DEBUGF("PCI Autoconfig: BAR %d, I/O, size=0x%llx, ", bar_nr, (u64)bar_size);
+                       debug("PCI Autoconfig: BAR %d, I/O, size=0x%llx, ",
+                             bar_nr, (unsigned long long)bar_size);
                } else {
                        if ((bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
                             PCI_BASE_ADDRESS_MEM_TYPE_64) {
@@ -152,7 +149,9 @@ void pciauto_setup_device(struct pci_controller *hose,
                                bar_res = mem;
 #endif
 
-                       DEBUGF("PCI Autoconfig: BAR %d, Mem, size=0x%llx, ", bar_nr, (u64)bar_size);
+                       debug("PCI Autoconfig: BAR %d, %s, size=0x%llx, ",
+                             bar_nr, bar_res == prefetch ? "Prf" : "Mem",
+                             (unsigned long long)bar_size);
                }
 
 #ifndef CONFIG_PCI_ENUM_ONLY
@@ -179,13 +178,15 @@ void pciauto_setup_device(struct pci_controller *hose,
                cmdstat |= (bar_response & PCI_BASE_ADDRESS_SPACE) ?
                        PCI_COMMAND_IO : PCI_COMMAND_MEMORY;
 
-               DEBUGF("\n");
+               debug("\n");
 
                bar_nr++;
        }
 
+#ifndef CONFIG_PCI_ENUM_ONLY
        /* Configure the expansion ROM address */
        pci_hose_read_config_byte(hose, dev, PCI_HEADER_TYPE, &header_type);
+       header_type &= 0x7f;
        if (header_type != PCI_HEADER_TYPE_CARDBUS) {
                rom_addr = (header_type == PCI_HEADER_TYPE_NORMAL) ?
                           PCI_ROM_ADDRESS : PCI_ROM_ADDRESS1;
@@ -193,16 +194,23 @@ void pciauto_setup_device(struct pci_controller *hose,
                pci_hose_read_config_dword(hose, dev, rom_addr, &bar_response);
                if (bar_response) {
                        bar_size = -(bar_response & ~1);
-                       DEBUGF("PCI Autoconfig: ROM, size=%#x, ", bar_size);
+                       debug("PCI Autoconfig: ROM, size=%#x, ",
+                             (unsigned int)bar_size);
                        if (pciauto_region_allocate(mem, bar_size,
                                                    &bar_value) == 0) {
                                pci_hose_write_config_dword(hose, dev, rom_addr,
                                                            bar_value);
                        }
                        cmdstat |= PCI_COMMAND_MEMORY;
-                       DEBUGF("\n");
+                       debug("\n");
                }
        }
+#endif
+
+       /* PCI_COMMAND_IO must be set for VGA device */
+       pci_hose_read_config_word(hose, dev, PCI_CLASS_DEVICE, &class);
+       if (class == PCI_CLASS_DISPLAY_VGA)
+               cmdstat |= PCI_COMMAND_IO;
 
        pci_hose_write_config_word(hose, dev, PCI_COMMAND, cmdstat);
        pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE,
@@ -411,7 +419,7 @@ void pciauto_config_init(struct pci_controller *hose)
        if (hose->pci_mem) {
                pciauto_region_init(hose->pci_mem);
 
-               DEBUGF("PCI Autoconfig: Bus Memory region: [0x%llx-0x%llx],\n"
+               debug("PCI Autoconfig: Bus Memory region: [0x%llx-0x%llx],\n"
                       "\t\tPhysical Memory [%llx-%llxx]\n",
                    (u64)hose->pci_mem->bus_start,
                    (u64)(hose->pci_mem->bus_start + hose->pci_mem->size - 1),
@@ -422,7 +430,7 @@ void pciauto_config_init(struct pci_controller *hose)
        if (hose->pci_prefetch) {
                pciauto_region_init(hose->pci_prefetch);
 
-               DEBUGF("PCI Autoconfig: Bus Prefetchable Mem: [0x%llx-0x%llx],\n"
+               debug("PCI Autoconfig: Bus Prefetchable Mem: [0x%llx-0x%llx],\n"
                       "\t\tPhysical Memory [%llx-%llx]\n",
                    (u64)hose->pci_prefetch->bus_start,
                    (u64)(hose->pci_prefetch->bus_start +
@@ -435,7 +443,7 @@ void pciauto_config_init(struct pci_controller *hose)
        if (hose->pci_io) {
                pciauto_region_init(hose->pci_io);
 
-               DEBUGF("PCI Autoconfig: Bus I/O region: [0x%llx-0x%llx],\n"
+               debug("PCI Autoconfig: Bus I/O region: [0x%llx-0x%llx],\n"
                       "\t\tPhysical Memory: [%llx-%llx]\n",
                    (u64)hose->pci_io->bus_start,
                    (u64)(hose->pci_io->bus_start + hose->pci_io->size - 1),
@@ -475,8 +483,8 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 
        switch (class) {
        case PCI_CLASS_BRIDGE_PCI:
-               DEBUGF("PCI Autoconfig: Found P2P bridge, device %d\n",
-                      PCI_DEV(dev));
+               debug("PCI Autoconfig: Found P2P bridge, device %d\n",
+                     PCI_DEV(dev));
 
                pciauto_setup_device(hose, dev, 2, pci_mem,
                                     pci_prefetch, pci_io);
@@ -512,8 +520,8 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
                pciauto_setup_device(hose, dev, 0, pci_mem,
                                     pci_prefetch, pci_io);
 
-               DEBUGF("PCI Autoconfig: Found P2CardBus bridge, device %d\n",
-                       PCI_DEV(dev));
+               debug("PCI Autoconfig: Found P2CardBus bridge, device %d\n",
+                     PCI_DEV(dev));
 
 #ifndef CONFIG_DM_PCI
                hose->current_busno++;
@@ -522,8 +530,8 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 
 #if defined(CONFIG_PCIAUTO_SKIP_HOST_BRIDGE)
        case PCI_CLASS_BRIDGE_OTHER:
-               DEBUGF("PCI Autoconfig: Skipping bridge device %d\n",
-                      PCI_DEV(dev));
+               debug("PCI Autoconfig: Skipping bridge device %d\n",
+                     PCI_DEV(dev));
                break;
 #endif
 #if defined(CONFIG_MPC834x) && !defined(CONFIG_VME8349)
@@ -534,14 +542,14 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
                 * device claiming resources io/mem/irq.. we only allow for
                 * the PIMMR window to be allocated (BAR0 - 1MB size)
                 */
-               DEBUGF("PCI Autoconfig: Broken bridge found, only minimal config\n");
+               debug("PCI Autoconfig: Broken bridge found, only minimal config\n");
                pciauto_setup_device(hose, dev, 0, hose->pci_mem,
                        hose->pci_prefetch, hose->pci_io);
                break;
 #endif
 
        case PCI_CLASS_PROCESSOR_POWERPC: /* an agent or end-point */
-               DEBUGF("PCI AutoConfig: Found PowerPC device\n");
+               debug("PCI AutoConfig: Found PowerPC device\n");
 
        default:
                pciauto_setup_device(hose, dev, 6, pci_mem,