pci_mfree(d->aux);
}
-static int
+static mach_port_t
device_port_lookup(struct pci_dev *d)
{
- mach_port_t device_port;
char server[NAME_MAX];
+ mach_port_t device_port = *((mach_port_t *) d->aux);
+
+ if (device_port != MACH_PORT_NULL)
+ return device_port;
snprintf(server, NAME_MAX, "%s/%04x/%02x/%02x/%01u/%s",
- _SERVERS_BUS_PCI, d->domain, d->bus, d->dev, d->func,
- FILE_CONFIG_NAME);
+ _SERVERS_BUS_PCI, d->domain, d->bus, d->dev, d->func,
+ FILE_CONFIG_NAME);
device_port = file_name_lookup(server, 0, 0);
- *((mach_port_t *) d->aux) = device_port;
+ if (device_port == MACH_PORT_NULL)
+ d->access->error("Cannot find the PCI arbiter");
- return d->aux != MACH_PORT_NULL;
+ *((mach_port_t *) d->aux) = device_port;
+ return device_port;
}
/* Walk through the FS tree to see what is allowed for us */
DIR *dir;
struct dirent *entry;
char path[NAME_MAX];
- uint32_t vd;
- uint8_t ht;
struct pci_dev *d;
dir = opendir(parent);
d->bus = bus;
d->dev = dev;
d->func = func;
-
- /* Get the arbiter port */
- if (!device_port_lookup(d))
- {
- if (closedir(dir) < 0)
- a->warning("Cannot close directory: %s (%s)", parent,
- strerror(errno));
- a->error("Cannot find the PCI arbiter");
- }
-
pci_link_dev(a, d);
-
- vd = pci_read_long(d, PCI_VENDOR_ID);
- ht = pci_read_byte(d, PCI_HEADER_TYPE);
-
- d->vendor_id = vd & 0xffff;
- d->device_id = vd >> 16U;
- d->known_fields = PCI_FILL_IDENT;
- d->hdrtype = ht;
}
}
int err;
size_t nread;
char *data;
- mach_port_t device_port;
-
- nread = len;
- if (*((mach_port_t *) d->aux) == MACH_PORT_NULL)
- {
- /* We still don't have the port for this device */
- if (device_port_lookup(d))
- {
- d->access->error("Cannot find the PCI arbiter");
- }
- }
- device_port = *((mach_port_t *) d->aux);
+ mach_port_t device_port = device_port_lookup(d);
if (len > 4)
- err = !pci_generic_block_read(d, pos, buf, nread);
- else
- {
- data = (char *) buf;
- err = pci_conf_read(device_port, pos, &data, &nread, len);
+ return pci_generic_block_read(d, pos, buf, len);
- if (data != (char *) buf)
- {
- if (nread > (size_t) len) /* Sanity check for bogus server. */
- {
- vm_deallocate(mach_task_self(), (vm_address_t) data, nread);
- return 0;
- }
+ data = (char *) buf;
+ err = pci_conf_read(device_port, pos, &data, &nread, len);
- memcpy(buf, data, nread);
+ if (data != (char *) buf)
+ {
+ if (nread > (size_t) len) /* Sanity check for bogus server. */
+ {
vm_deallocate(mach_task_self(), (vm_address_t) data, nread);
+ return 0;
}
+
+ memcpy(buf, data, nread);
+ vm_deallocate(mach_task_self(), (vm_address_t) data, nread);
}
- if (err)
- return 0;
- return nread == (size_t) len;
+ return !err && nread == (size_t) len;
}
/*
{
int err;
size_t nwrote;
- mach_port_t device_port;
-
- nwrote = len;
- if (*((mach_port_t *) d->aux) == MACH_PORT_NULL)
- {
- /* We still don't have the port for this device */
- if (device_port_lookup(d))
- {
- d->access->error("Cannot find the PCI arbiter");
- }
- }
- device_port = *((mach_port_t *) d->aux);
+ mach_port_t device_port = device_port_lookup(d);
if (len > 4)
- err = !pci_generic_block_write(d, pos, buf, len);
- else
- err = pci_conf_write(device_port, pos, (char *) buf, len, &nwrote);
- if (err)
- return 0;
+ return pci_generic_block_write(d, pos, buf, len);
- return nwrote == (size_t) len;
+ err = pci_conf_write(device_port, pos, (char *) buf, len, &nwrote);
+
+ return !err && nwrote == (size_t) len;
}
/* Get requested info from the server */
-static int
-hurd_fill_info(struct pci_dev *d, int flags)
+
+static void
+hurd_fill_regions(struct pci_dev *d)
{
- int err, i;
+ mach_port_t device_port = device_port_lookup(d);
struct pci_bar regions[6];
- struct pci_xrom_bar rom;
- size_t size;
- char *buf;
- mach_port_t device_port;
+ char *buf = (char *) ®ions;
+ size_t size = sizeof(regions);
- device_port = *((mach_port_t *) d->aux);
+ int err = pci_get_dev_regions(device_port, &buf, &size);
+ if (err)
+ return;
- if (flags & PCI_FILL_BASES)
+ if ((char *) ®ions != buf)
{
- buf = (char *) ®ions;
- size = sizeof(regions);
-
- err = pci_get_dev_regions(device_port, &buf, &size);
- if (err)
- return err;
-
- if ((char *) ®ions != buf)
+ /* Sanity check for bogus server. */
+ if (size > sizeof(regions))
{
- /* Sanity check for bogus server. */
- if (size > sizeof(regions))
- {
- vm_deallocate(mach_task_self(), (vm_address_t) buf, size);
- return EGRATUITOUS;
- }
-
- memcpy(®ions, buf, size);
vm_deallocate(mach_task_self(), (vm_address_t) buf, size);
+ return;
}
- for (i = 0; i < 6; i++)
- {
- if (regions[i].size == 0)
- continue;
+ memcpy(®ions, buf, size);
+ vm_deallocate(mach_task_self(), (vm_address_t) buf, size);
+ }
- d->base_addr[i] = regions[i].base_addr;
- d->base_addr[i] |= regions[i].is_IO;
- d->base_addr[i] |= regions[i].is_64 << 2;
- d->base_addr[i] |= regions[i].is_prefetchable << 3;
+ for (int i = 0; i < 6; i++)
+ {
+ if (regions[i].size == 0)
+ continue;
- if (flags & PCI_FILL_SIZES)
- d->size[i] = regions[i].size;
- }
+ d->base_addr[i] = regions[i].base_addr;
+ d->base_addr[i] |= regions[i].is_IO;
+ d->base_addr[i] |= regions[i].is_64 << 2;
+ d->base_addr[i] |= regions[i].is_prefetchable << 3;
+
+ d->size[i] = regions[i].size;
}
+}
+
+static void
+hurd_fill_rom(struct pci_dev *d)
+{
+ struct pci_xrom_bar rom;
+ mach_port_t device_port = device_port_lookup(d);
+ char *buf = (char *) &rom;
+ size_t size = sizeof(rom);
+
+ int err = pci_get_dev_rom(device_port, &buf, &size);
+ if (err)
+ return;
- if (flags & PCI_FILL_ROM_BASE)
+ if ((char *) &rom != buf)
{
- /* Get rom info */
- buf = (char *) &rom;
- size = sizeof(rom);
- err = pci_get_dev_rom(device_port, &buf, &size);
- if (err)
- return err;
-
- if ((char *) &rom != buf)
+ /* Sanity check for bogus server. */
+ if (size > sizeof(rom))
{
- /* Sanity check for bogus server. */
- if (size > sizeof(rom))
- {
- vm_deallocate(mach_task_self(), (vm_address_t) buf, size);
- return EGRATUITOUS;
- }
-
- memcpy(&rom, buf, size);
vm_deallocate(mach_task_self(), (vm_address_t) buf, size);
+ return;
}
- d->rom_base_addr = rom.base_addr;
- d->rom_size = rom.size;
+ memcpy(&rom, buf, size);
+ vm_deallocate(mach_task_self(), (vm_address_t) buf, size);
+ }
+
+ d->rom_base_addr = rom.base_addr;
+ d->rom_size = rom.size;
+}
+
+static unsigned int
+hurd_fill_info(struct pci_dev *d, unsigned int flags)
+{
+ unsigned int done = 0;
+
+ if (!d->access->buscentric)
+ {
+ if (flags & (PCI_FILL_BASES | PCI_FILL_SIZES))
+ {
+ hurd_fill_regions(d);
+ done |= PCI_FILL_BASES | PCI_FILL_SIZES;
+ }
+ if (flags & PCI_FILL_ROM_BASE)
+ {
+ hurd_fill_rom(d);
+ done |= PCI_FILL_ROM_BASE;
+ }
}
- return pci_generic_fill_info(d, flags);
+ return done | pci_generic_fill_info(d, flags & ~done);
}
struct pci_methods pm_hurd = {
projects / pciutils.git / blobdiff