summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/core/uclass.c2
-rw-r--r--drivers/gpio/intel_ich6_gpio.c2
-rw-r--r--drivers/pci/pci-uclass.c4
-rw-r--r--drivers/pci/pci.c3
-rw-r--r--drivers/pci/pci_auto.c53
-rw-r--r--drivers/pci/pci_compat.c1
-rw-r--r--drivers/pci/pci_rom.c4
-rw-r--r--drivers/serial/Kconfig19
-rw-r--r--drivers/serial/Makefile1
-rw-r--r--drivers/serial/serial-uclass.c2
-rw-r--r--drivers/serial/serial_efi.c157
-rw-r--r--drivers/video/vesa_fb.c8
12 files changed, 223 insertions, 33 deletions
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index aba98801fd..ffe69956d5 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -153,6 +153,8 @@ int uclass_find_device(enum uclass_id id, int index, struct udevice **devp)
ret = uclass_get(id, &uc);
if (ret)
return ret;
+ if (list_empty(&uc->dev_head))
+ return -ENODEV;
list_for_each_entry(dev, &uc->dev_head, uclass_node) {
if (!index--) {
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 8a108f3805..cb408a413e 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -35,6 +35,8 @@
#include <asm/io.h>
#include <asm/pci.h>
+DECLARE_GLOBAL_DATA_PTR;
+
#define GPIO_PER_BANK 32
struct ich6_bank_priv {
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index c7d93f92d6..6262f352c9 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -641,10 +641,6 @@ static int pci_uclass_post_probe(struct udevice *bus)
{
int ret;
- /* Don't scan buses before relocation */
- if (!(gd->flags & GD_FLG_RELOC))
- return 0;
-
debug("%s: probing bus %d\n", __func__, bus->seq);
ret = pci_bind_bus_devices(bus);
if (ret)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index df50b48003..645ecd423f 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -269,7 +269,8 @@ int pci_hose_config_device(struct pci_controller *hose,
/* Disable interrupt line, if device says it wants to use interrupts */
pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_PIN, &pin);
if (pin != 0) {
- pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE, 0xff);
+ pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE,
+ PCI_INTERRUPT_LINE_DISABLE);
}
pci_hose_read_config_dword(hose, dev, PCI_COMMAND, &old_command);
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index a7af8cb5f1..41d5447f12 100644
--- 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,9 +82,9 @@ 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;
@@ -122,7 +117,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 +148,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,11 +177,12 @@ 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);
if (header_type != PCI_HEADER_TYPE_CARDBUS) {
@@ -193,16 +192,18 @@ 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_hose_write_config_word(hose, dev, PCI_COMMAND, cmdstat);
pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE,
@@ -411,7 +412,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 +423,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 +436,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 +476,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 +513,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 +523,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 +535,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,
diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c
index 05c35105ab..712c48f28f 100644
--- a/drivers/pci/pci_compat.c
+++ b/drivers/pci/pci_compat.c
@@ -5,7 +5,6 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-#define DEBUG
#include <common.h>
#include <dm.h>
#include <errno.h>
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index a33efae263..26db3ca0a1 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -235,6 +235,10 @@ void setup_video(struct screen_info *screen_info)
#ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE
struct vesa_mode_info *vesa = &mode_info.vesa;
+ /* Sanity test on VESA parameters */
+ if (!vesa->x_resolution || !vesa->y_resolution)
+ return;
+
screen_info->orig_video_isVGA = VIDEO_TYPE_VLFB;
screen_info->lfb_width = vesa->x_resolution;
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 4829284216..b5a91b707e 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -44,6 +44,15 @@ config DEBUG_UART_NS16550
will need to provide parameters to make this work. The driver will
be available until the real driver model serial is running.
+config DEBUG_EFI_CONSOLE
+ bool "EFI"
+ depends on EFI_APP
+ help
+ Select this to enable a debug console which calls back to EFI to
+ output to the console. This can be useful for early debugging of
+ U-Boot when running on top of EFI (Extensive Firmware Interface).
+ This is a type of BIOS used by PCs.
+
endchoice
config DEBUG_UART_BASE
@@ -102,3 +111,13 @@ config UNIPHIER_SERIAL
help
If you have a UniPhier based board and want to use the on-chip
serial ports, say Y to this option. If unsure, say N.
+
+config X86_SERIAL
+ bool "Support for 16550 serial port on x86 machines"
+ depends on X86
+ default y
+ help
+ Most x86 machines have a ns16550 UART or compatible. This can be
+ enabled in the device tree with the correct input clock frequency
+ provided (default 1843200). Enable this to obtain serial console
+ output.
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index d183eedbcb..1d1f0361cd 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o
obj-$(CONFIG_ARM_DCC) += arm_dcc.o
obj-$(CONFIG_ATMEL_USART) += atmel_usart.o
obj-$(CONFIG_DW_SERIAL) += serial_dw.o
+obj-$(CONFIG_EFI_APP) += serial_efi.o
obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o
obj-$(CONFIG_MCFUART) += mcfuart.o
obj-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 815fec3264..bbc366b322 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -71,7 +71,7 @@ static void serial_find_console_or_panic(void)
#endif
if (!uclass_get_device_by_seq(UCLASS_SERIAL, INDEX, &dev) ||
!uclass_get_device(UCLASS_SERIAL, INDEX, &dev) ||
- (!uclass_first_device(UCLASS_SERIAL, &dev) || dev)) {
+ (!uclass_first_device(UCLASS_SERIAL, &dev) && dev)) {
gd->cur_serial_dev = dev;
return;
}
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
new file mode 100644
index 0000000000..cf57d8977b
--- /dev/null
+++ b/drivers/serial/serial_efi.c
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <debug_uart.h>
+#include <dm.h>
+#include <efi.h>
+#include <efi_api.h>
+#include <errno.h>
+#include <fdtdec.h>
+#include <linux/compiler.h>
+#include <asm/io.h>
+#include <serial.h>
+
+/* Information about the efi console */
+struct serial_efi_priv {
+ struct efi_simple_input_interface *con_in;
+ struct efi_simple_text_output_protocol *con_out;
+ struct efi_input_key key;
+ bool have_key;
+};
+
+int serial_efi_setbrg(struct udevice *dev, int baudrate)
+{
+ return 0;
+}
+
+static int serial_efi_get_key(struct serial_efi_priv *priv)
+{
+ int ret;
+
+ if (priv->have_key)
+ return 0;
+ ret = priv->con_in->read_key_stroke(priv->con_in, &priv->key);
+ if (ret == EFI_NOT_READY)
+ return -EAGAIN;
+ else if (ret != EFI_SUCCESS)
+ return -EIO;
+
+ priv->have_key = true;
+
+ return 0;
+}
+
+static int serial_efi_getc(struct udevice *dev)
+{
+ struct serial_efi_priv *priv = dev_get_priv(dev);
+ int ret, ch;
+
+ ret = serial_efi_get_key(priv);
+ if (ret)
+ return ret;
+
+ priv->have_key = false;
+ ch = priv->key.unicode_char;
+
+ /*
+ * Unicode char 8 (for backspace) is never returned. Instead we get a
+ * key scan code of 8. Handle this so that backspace works correctly
+ * in the U-Boot command line.
+ */
+ if (!ch && priv->key.scan_code == 8)
+ ch = 8;
+ debug(" [%x %x %x] ", ch, priv->key.unicode_char, priv->key.scan_code);
+
+ return ch;
+}
+
+static int serial_efi_putc(struct udevice *dev, const char ch)
+{
+ struct serial_efi_priv *priv = dev_get_priv(dev);
+ uint16_t ucode[2];
+ int ret;
+
+ ucode[0] = ch;
+ ucode[1] = '\0';
+ ret = priv->con_out->output_string(priv->con_out, ucode);
+ if (ret)
+ return -EIO;
+
+ return 0;
+}
+
+static int serial_efi_pending(struct udevice *dev, bool input)
+{
+ struct serial_efi_priv *priv = dev_get_priv(dev);
+ int ret;
+
+ /* We assume that EFI will stall if its output buffer fills up */
+ if (!input)
+ return 0;
+
+ ret = serial_efi_get_key(priv);
+ if (ret == -EAGAIN)
+ return 0;
+ else if (ret)
+ return ret;
+
+ return 1;
+}
+
+/*
+ * There is nothing to init here since the EFI console is already running by
+ * the time we enter U-Boot.
+ */
+void debug_uart_init(void)
+{
+}
+
+static inline void _debug_uart_putc(int ch)
+{
+ struct efi_system_table *sys_table = efi_get_sys_table();
+ uint16_t ucode[2];
+
+ ucode[0] = ch;
+ ucode[1] = '\0';
+ sys_table->con_out->output_string(sys_table->con_out, ucode);
+}
+
+DEBUG_UART_FUNCS
+
+static int serial_efi_probe(struct udevice *dev)
+{
+ struct efi_system_table *table = efi_get_sys_table();
+ struct serial_efi_priv *priv = dev_get_priv(dev);
+
+ priv->con_in = table->con_in;
+ priv->con_out = table->con_out;
+
+ return 0;
+}
+
+static const struct dm_serial_ops serial_efi_ops = {
+ .putc = serial_efi_putc,
+ .getc = serial_efi_getc,
+ .pending = serial_efi_pending,
+ .setbrg = serial_efi_setbrg,
+};
+
+static const struct udevice_id serial_efi_ids[] = {
+ { .compatible = "efi,uart" },
+ { }
+};
+
+U_BOOT_DRIVER(serial_efi) = {
+ .name = "serial_efi",
+ .id = UCLASS_SERIAL,
+ .of_match = serial_efi_ids,
+ .priv_auto_alloc_size = sizeof(struct serial_efi_priv),
+ .probe = serial_efi_probe,
+ .ops = &serial_efi_ops,
+ .flags = DM_FLAG_PRE_RELOC,
+};
diff --git a/drivers/video/vesa_fb.c b/drivers/video/vesa_fb.c
index 909f8e8091..4e6d070a5f 100644
--- a/drivers/video/vesa_fb.c
+++ b/drivers/video/vesa_fb.c
@@ -24,6 +24,14 @@ void *video_hw_init(void)
int ret;
printf("Video: ");
+ if (!ll_boot_init()) {
+ /*
+ * If we are running from EFI or coreboot, this driver can't
+ * work.
+ */
+ printf("Not available (previous bootloader prevents it)\n");
+ return NULL;
+ }
if (vbe_get_video_info(gdev)) {
dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, 0);
if (dev == -1) {
OpenPOWER on IntegriCloud