OpenBIOS January 2009

openbios@openbios.org

14 participants
148 discussions

Start a nNew thread

[PATCH 7/8] Don't hang if we discover an unknown device
by Laurent Vivier 07 Jan '09

07 Jan '09

Don't hang when a PCI device is not in the list of the known ones. Found by using qemu with "-usb".

2 1

r369 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:57:07 +0100 (Wed, 07 Jan 2009) New Revision: 369 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.c Log: Don't hang if we discover an unknown device (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:55:19 UTC (rev 368) +++ openbios-devel/drivers/pci.c 2009-01-07 15:57:07 UTC (rev 369) @@ -510,38 +510,43 @@ set_int_property(dev, "cache-line-size", pci_config_read16(addr, PCI_CACHE_LINE_SIZE)); - if (pci_dev->type) { - push_str(pci_dev->type); - fword("encode-string"); - push_str("device_type"); - fword("property"); + if (pci_dev) { + if (pci_dev->type) { + push_str(pci_dev->type); + fword("encode-string"); + push_str("device_type"); + fword("property"); + } + if (pci_dev->model) { + push_str(pci_dev->model); + fword("encode-string"); + push_str("model"); + fword("property"); + } + if (pci_dev->compat) + set_property(dev, "compatible", + pci_dev->compat, pci_compat_len(pci_dev)); + + if (pci_dev->acells) + set_int_property(dev, "#address-cells", + pci_dev->acells); + if (pci_dev->scells) + set_int_property(dev, "#size-cells", + pci_dev->scells); + if (pci_dev->icells) + set_int_property(dev, "#interrupt-cells", + pci_dev->icells); } - if (pci_dev->model) { - push_str(pci_dev->model); - fword("encode-string"); - push_str("model"); - fword("property"); - } - if (pci_dev->compat) - set_property(dev, "compatible", - pci_dev->compat, pci_compat_len(pci_dev)); pci_set_reg(config); pci_set_assigned_addresses(config); pci_set_interrupt_map(config); - if (pci_dev->acells) - set_int_property(dev, "#address-cells", pci_dev->acells); - if (pci_dev->scells) - set_int_property(dev, "#size-cells", pci_dev->scells); - if (pci_dev->icells) - set_int_property(dev, "#interrupt-cells", pci_dev->icells); - #ifdef CONFIG_DEBUG_PCI printk("\n"); #endif - if (pci_dev->config_cb) + if (pci_dev && pci_dev->config_cb) pci_dev->config_cb(config); } Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-01-07 15:55:19 UTC (rev 368) +++ openbios-devel/drivers/pci_database.c 2009-01-07 15:57:07 UTC (rev 369) @@ -1022,7 +1022,9 @@ break; } } - find_device: +find_device: + if (dev == NULL) + goto bad_device; for (;; dev++) { if (dev->vendor == 0xFFFF && dev->product == 0xFFFF) { goto bad_device; @@ -1055,7 +1057,7 @@ return new; } } - bad_device: +bad_device: printk("Cannot manage '%s' PCI device type '%s':\n %x %x (%x %x %x)\n", name, type, vendor, product, class, subclass, iface);

1 0

[PATCH 6/8] Create special properties for host and bridge
by Laurent Vivier 07 Jan '09

07 Jan '09

Create properties "ranges", "bus-ranges" and "reg" for PCI host and bridge. Create aliases "pci" and "bridge".

2 1

r368 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:55:19 +0100 (Wed, 07 Jan 2009) New Revision: 368 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.c openbios-devel/drivers/pci_database.h Log: Create special properties for host and bridge (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:53:14 UTC (rev 367) +++ openbios-devel/drivers/pci.c 2009-01-07 15:55:19 UTC (rev 368) @@ -164,6 +164,88 @@ { "encode-unit", ob_pci_encode_unit }, }; +static void pci_set_bus_range(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[2]; + + props[0] = (config->dev >> 16) & 0xFF; + props[1] = 1; + set_property(dev, "bus-range", (char *)props, 2 * sizeof(cell)); +} + +static void pci_host_set_reg(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[2]; + + props[0] = arch->cfg_base; + props[1] = arch->cfg_len; + set_property(dev, "reg", (char *)props, 2 * sizeof(cell)); +} + +static void pci_host_set_ranges(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[32]; + int ncells; + + ncells = 0; + if (arch->io_base) { + pci_encode_phys_addr(props + ncells, 0, IO_SPACE, + config->dev, 0, 0); + ncells += 3; + props[ncells++] = arch->io_base; + props[ncells++] = 0x00000000; + props[ncells++] = arch->io_len; + } + if (arch->rbase) { + pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, + config->dev, 0, 0); + ncells += 3; + props[ncells++] = arch->rbase; + props[ncells++] = 0x00000000; + props[ncells++] = arch->rlen; + } + if (arch->mem_base) { + pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, + config->dev, 0, arch->mem_base); + ncells += 3; + props[ncells++] = arch->mem_base; + props[ncells++] = 0x00000000; + props[ncells++] = arch->mem_len; + } + set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); +} + +int host_config_cb(const pci_config_t *config) +{ + phandle_t aliases; + + aliases = find_dev("/aliases"); + if (aliases) + set_property(aliases, "pci", + config->path, strlen(config->path) + 1); + + pci_host_set_reg(config); + pci_host_set_ranges(config); + pci_set_bus_range(config); + + return 0; +} + +int bridge_config_cb(const pci_config_t *config) +{ + phandle_t aliases; + + aliases = find_dev("/aliases"); + set_property(aliases, "bridge", config->path, strlen(config->path) + 1); + + pci_set_bus_range(config); + + return 0; +} + int ide_config_cb2 (const pci_config_t *config) { ob_ide_init(config->path, Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-01-07 15:53:14 UTC (rev 367) +++ openbios-devel/drivers/pci_database.c 2009-01-07 15:55:19 UTC (rev 368) @@ -269,7 +269,7 @@ 0x1057, 0x0002, "pci", "pci", "MOT,MPC106", "grackle\0", 3, 2, 1, - NULL, NULL + host_config_cb, NULL }, { 0x1057, 0x4801, NULL, @@ -290,7 +290,7 @@ 0x1011, 0x0026, NULL, "pci-bridge", "DEV,21154", "DEV,21154\0pci-bridge\0", 3, 2, 1, - NULL, NULL, + bridge_config_cb, NULL, }, { 0xFFFF, 0xFFFF, Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-07 15:53:14 UTC (rev 367) +++ openbios-devel/drivers/pci_database.h 2009-01-07 15:55:19 UTC (rev 368) @@ -29,6 +29,8 @@ extern int eth_config_cb(const pci_config_t *config); extern int macio_config_cb(const pci_config_t *config); extern int vga_config_cb(const pci_config_t *config); +extern int host_config_cb(const pci_config_t *config); +extern int bridge_config_cb(const pci_config_t *config); static inline int pci_compat_len(const pci_dev_t *dev) {

1 0

[PATCH 5/8] Create "ranges" property
by Laurent Vivier 07 Jan '09

07 Jan '09

Create "ranges" property for mac-io.

2 1

r367 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:53:14 +0100 (Wed, 07 Jan 2009) New Revision: 367 Modified: openbios-devel/drivers/pci.c Log: Create "ranges" property (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:51:40 UTC (rev 366) +++ openbios-devel/drivers/pci.c 2009-01-07 15:53:14 UTC (rev 367) @@ -323,8 +323,46 @@ set_property(dev, "reg", (char *)props, ncells * sizeof(cell)); } + +static void pci_set_ranges(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[32]; + int ncells; + int i; + uint32_t mask; + int flags; + int space_code; + + ncells = 0; + for (i = 0; i < 6; i++) { + if (!config->assigned[i] || !config->sizes[i]) + continue; + + /* child address */ + + props[ncells++] = 0x00000000; + + /* parent address */ + + pci_decode_pci_addr(config->assigned[i], + &flags, &space_code, &mask); + pci_encode_phys_addr(props + ncells, flags, space_code, + config->dev, 0x10 + i * 4, + config->assigned[i] & ~mask); + ncells += 3; + + /* size */ + + props[ncells++] = config->sizes[i]; + } + set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); +} + int macio_config_cb (const pci_config_t *config) { + pci_set_ranges(config); + #ifdef CONFIG_DRIVER_MACIO ob_macio_init(config->path, config->assigned[0] & ~0x0000000F); #endif

1 0

[PATCH 4/8] Correctly create "reg" property for PCI devices
by Laurent Vivier 07 Jan '09

07 Jan '09

Create "reg" property according to "PCI Bus Binding to: IEEE Std 1275-1994 Standard for Boot (Initialization Configuration) Firmware Revision 2.1"

2 1

r366 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:51:40 +0100 (Wed, 07 Jan 2009) New Revision: 366 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.h Log: Correctly create "reg" property for PCI devices (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:50:03 UTC (rev 365) +++ openbios-devel/drivers/pci.c 2009-01-07 15:51:40 UTC (rev 366) @@ -176,22 +176,12 @@ int eth_config_cb (const pci_config_t *config) { - phandle_t ph; - cell props[12]; - int i; + phandle_t ph = get_cur_dev();; - ph = find_dev(config->path); - set_property(ph, "network-type", "ethernet", 9); set_property(ph, "removable", "network", 8); set_property(ph, "category", "net", 4); - for (i = 0; i < 7; i++) - { - props[i*2] = config->assigned[i] & ~0x0000000F; - props[i*2 + 1] = config->sizes[i]; - } - set_property(ph, "reg", (char *)props, i * 2 * sizeof(cell)); return 0; } @@ -295,6 +285,44 @@ ncells * sizeof(cell)); } +static void pci_set_reg(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[38]; + int ncells; + int i; + uint32_t mask; + int space_code, flags; + + ncells = 0; + pci_encode_phys_addr(props + ncells, 0, CONFIGURATION_SPACE, + config->dev, 0, 0); + ncells += 3; + + props[ncells++] = 0x00000000; + props[ncells++] = 0x00000000; + + for (i = 0; i < 6; i++) { + if (!config->assigned[i] || !config->sizes[i]) + continue; + + pci_decode_pci_addr(config->regions[i], + &flags, &space_code, &mask); + + pci_encode_phys_addr(props + ncells, + flags, space_code, config->dev, + PCI_BASE_ADDR_0 + (i * sizeof(uint32_t)), + config->regions[i] & ~mask); + ncells += 3; + + /* set size */ + + props[ncells++] = 0x00000000; + props[ncells++] = config->sizes[i]; + } + set_property(dev, "reg", (char *)props, ncells * sizeof(cell)); +} + int macio_config_cb (const pci_config_t *config) { #ifdef CONFIG_DRIVER_MACIO @@ -378,6 +406,7 @@ set_property(dev, "compatible", pci_dev->compat, pci_compat_len(pci_dev)); + pci_set_reg(config); pci_set_assigned_addresses(config); pci_set_interrupt_map(config); @@ -396,20 +425,6 @@ pci_dev->config_cb(config); } -static void ob_pci_add_reg(pci_addr addr) -{ - PUSH(0); - PUSH(0); - PUSH(addr&(~arch->cfg_base)); - fword("pci-addr-encode"); - PUSH(0); - PUSH(0); - fword("pci-len-encode"); - fword("encode+"); - push_str("reg"); - fword("property"); -} - #ifdef CONFIG_XBOX static char pci_xbox_blacklisted (int bus, int devnum, int fn) { @@ -486,6 +501,8 @@ else config_addr = PCI_BASE_ADDR_0 + reg * 4; + config->regions[reg] = pci_config_read32(addr, config_addr); + /* get region size */ pci_config_write32(addr, config_addr, 0xffffffff); @@ -594,7 +611,6 @@ ob_pci_configure(addr, &config, mem_base, io_base); ob_pci_add_properties(addr, pci_dev, &config); - ob_pci_add_reg(addr); if (ccode == 0x0600 || ccode == 0x0604) { /* host or bridge */ Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-07 15:50:03 UTC (rev 365) +++ openbios-devel/drivers/pci_database.h 2009-01-07 15:51:40 UTC (rev 366) @@ -3,6 +3,7 @@ struct pci_config_t { char path[256]; uint32_t dev; /* bus, dev, fn */ + uint32_t regions[7]; uint32_t assigned[7]; uint32_t sizes[7]; int irq_pin;

1 0

[PATCH 3/8] Create "assigned-addresses" property
by Laurent Vivier 07 Jan '09

07 Jan '09

Create "assigned-addesses" property.

2 1

r365 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:50:03 +0100 (Wed, 07 Jan 2009) New Revision: 365 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.h Log: Create "assigned-addresses" property (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:46:49 UTC (rev 364) +++ openbios-devel/drivers/pci.c 2009-01-07 15:50:03 UTC (rev 365) @@ -167,10 +167,10 @@ int ide_config_cb2 (const pci_config_t *config) { ob_ide_init(config->path, - config->regions[0] & ~0x0000000F, - config->regions[1] & ~0x0000000F, - config->regions[2] & ~0x0000000F, - config->regions[3] & ~0x0000000F); + config->assigned[0] & ~0x0000000F, + config->assigned[1] & ~0x0000000F, + config->assigned[2] & ~0x0000000F, + config->assigned[3] & ~0x0000000F); return 0; } @@ -188,7 +188,7 @@ for (i = 0; i < 7; i++) { - props[i*2] = config->regions[i]; + props[i*2] = config->assigned[i] & ~0x0000000F; props[i*2 + 1] = config->sizes[i]; } set_property(ph, "reg", (char *)props, i * 2 * sizeof(cell)); @@ -241,19 +241,75 @@ } } +static inline void pci_decode_pci_addr(pci_addr addr, int *flags, + int *space_code, uint32_t *mask) +{ + if (addr & 0x01) { + + *space_code = IO_SPACE; + *flags = 0; + *mask = 0x00000001; + + } else if (addr & 0x04) { + + *flags = IS_NOT_RELOCATABLE; + *space_code = MEMORY_SPACE_64; + *mask = 0x0000000F; + + } else { + + *space_code = MEMORY_SPACE_32; + *flags = IS_NOT_RELOCATABLE; + *mask = 0x0000000F; + + } +} + +static void pci_set_assigned_addresses(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[32]; + int ncells; + int i; + uint32_t mask; + int flags, space_code; + + ncells = 0; + for (i = 0; i < 6; i++) { + if (!config->assigned[i] || !config->sizes[i]) + continue; + pci_decode_pci_addr(config->assigned[i], + &flags, &space_code, &mask); + + pci_encode_phys_addr(props + ncells, + flags, space_code, config->dev, + PCI_BASE_ADDR_0 + (i * sizeof(uint32_t)), + config->assigned[i] & ~mask); + ncells += 3; + + props[ncells++] = 0x00000000; + props[ncells++] = config->sizes[i]; + } + if (ncells) + set_property(dev, "assigned-addresses", (char *)props, + ncells * sizeof(cell)); +} + int macio_config_cb (const pci_config_t *config) { #ifdef CONFIG_DRIVER_MACIO - ob_macio_init(config->path, config->regions[0] & ~0x0000000F); + ob_macio_init(config->path, config->assigned[0] & ~0x0000000F); #endif return 0; } int vga_config_cb (const pci_config_t *config) { - if (config->regions[0] != 0x00000000) - vga_vbe_init(config->path, config->regions[0], config->sizes[0], - config->regions[1], config->sizes[1]); + if (config->assigned[0] != 0x00000000) + vga_vbe_init(config->path, config->assigned[0] & ~0x0000000F, + config->sizes[0], + config->assigned[1] & ~0x0000000F, + config->sizes[1]); return 0; } @@ -322,6 +378,7 @@ set_property(dev, "compatible", pci_dev->compat, pci_compat_len(pci_dev)); + pci_set_assigned_addresses(config); pci_set_interrupt_map(config); if (pci_dev->acells) @@ -416,7 +473,7 @@ omask = 0x00000000; for (reg = 0; reg < 7; reg++) { - config->regions[reg] = 0x00000000; + config->assigned[reg] = 0x00000000; config->sizes[reg] = 0x00000000; if ((omask & 0x0000000f) == 0x4) { @@ -473,7 +530,7 @@ *mem_base = reloc + size; } pci_config_write32(addr, config_addr, reloc | omask); - config->regions[reg] = reloc; + config->assigned[reg] = reloc | omask; } } Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-07 15:46:49 UTC (rev 364) +++ openbios-devel/drivers/pci_database.h 2009-01-07 15:50:03 UTC (rev 365) @@ -3,7 +3,7 @@ struct pci_config_t { char path[256]; uint32_t dev; /* bus, dev, fn */ - uint32_t regions[7]; + uint32_t assigned[7]; uint32_t sizes[7]; int irq_pin; int irq_line;

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
Older →

Jump to page: