X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fproc.c;h=cb9d08d17768dd1379849ca505d58ebe33067fae;hb=1efd2d4d5056e08d9ed7e42ab9b47d367422a653;hp=d18a0dbf655319311e856e0d46bb7cfb37e0e42e;hpb=a85769a88b81f22aa43895199cbb01a12e0ab0a7;p=pciutils.git diff --git a/lib/proc.c b/lib/proc.c index d18a0db..cb9d08d 100644 --- a/lib/proc.c +++ b/lib/proc.c @@ -1,7 +1,7 @@ /* * The PCI Library -- Configuration Access via /proc/bus/pci * - * Copyright (c) 1997--1999 Martin Mares + * Copyright (c) 1997--2003 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -16,76 +16,18 @@ #include #include "internal.h" - -/* - * We'd like to use pread/pwrite for configuration space accesses, but - * unfortunately it isn't simple at all since all libc's until glibc 2.1 - * don't define it. - */ - -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0 -/* glibc 2.1 or newer -> pread/pwrite supported automatically */ - -#elif defined(i386) && defined(__GLIBC__) -/* glibc 2.0 on i386 -> call syscalls directly */ -#include -#include -#ifndef SYS_pread -#define SYS_pread 180 -#endif -static int pread(unsigned int fd, void *buf, size_t size, loff_t where) -{ return syscall(SYS_pread, fd, buf, size, where); } -#ifndef SYS_pwrite -#define SYS_pwrite 181 -#endif -static int pwrite(unsigned int fd, void *buf, size_t size, loff_t where) -{ return syscall(SYS_pwrite, fd, buf, size, where); } - -#elif defined(i386) -/* old libc on i386 -> call syscalls directly the old way */ -#include -static _syscall5(int, pread, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi); -static _syscall5(int, pwrite, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi); -static int do_read(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pread(fd, buf, size, where, 0); } -static int do_write(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pwrite(fd, buf, size, where, 0); } -#define HAVE_DO_READ - -#else -/* In all other cases we use lseek/read/write instead to be safe */ -#define make_rw_glue(op) \ - static int do_##op(struct pci_dev *d, int fd, void *buf, size_t size, int where) \ - { \ - struct pci_access *a = d->access; \ - int r; \ - if (a->fd_pos != where && lseek(fd, where, SEEK_SET) < 0) \ - return -1; \ - r = op(fd, buf, size); \ - if (r < 0) \ - a->fd_pos = -1; \ - else \ - a->fd_pos = where + r; \ - return r; \ - } -make_rw_glue(read) -make_rw_glue(write) -#define HAVE_DO_READ -#endif - -#ifndef HAVE_DO_READ -#define do_read(d,f,b,l,p) pread(f,b,l,p) -#define do_write(d,f,b,l,p) pwrite(f,b,l,p) -#endif +#include "pread.h" static void proc_config(struct pci_access *a) { - a->method_params[PCI_ACCESS_PROC_BUS_PCI] = PATH_PROC_BUS_PCI; + pci_define_param(a, "proc.path", PCI_PATH_PROC_BUS_PCI, "Path to the procfs bus tree"); } static int proc_detect(struct pci_access *a) { - char *name = a->method_params[PCI_ACCESS_PROC_BUS_PCI]; + char *name = pci_get_param(a, "proc.path"); if (access(name, R_OK)) { @@ -118,7 +60,7 @@ proc_scan(struct pci_access *a) FILE *f; char buf[512]; - if (snprintf(buf, sizeof(buf), "%s/devices", a->method_params[PCI_ACCESS_PROC_BUS_PCI]) == sizeof(buf)) + if (snprintf(buf, sizeof(buf), "%s/devices", pci_get_param(a, "proc.path")) == sizeof(buf)) a->error("File name too long"); f = fopen(buf, "r"); if (!f) @@ -128,12 +70,8 @@ proc_scan(struct pci_access *a) struct pci_dev *d = pci_alloc_dev(a); unsigned int dfn, vend, cnt, known; - cnt = sscanf(buf, -#ifdef HAVE_LONG_ADDRESS - "%x %x %x %llx %llx %llx %llx %llx %llx %llx %llx %llx %llx %llx %llx %llx %llx", -#else - "%x %x %x %lx %lx %lx %lx %lx %lx %lx %lx %lx %lx %lx %lx %lx %lx", -#endif +#define F " " PCIADDR_T_FMT + cnt = sscanf(buf, "%x %x %x" F F F F F F F F F F F F F F, &dfn, &vend, &d->irq, @@ -151,6 +89,7 @@ proc_scan(struct pci_access *a) &d->size[4], &d->size[5], &d->rom_size); +#undef F if (cnt != 9 && cnt != 10 && cnt != 17) a->error("proc: parse error (read only %d items)", cnt); d->bus = dfn >> 8U; @@ -158,11 +97,10 @@ proc_scan(struct pci_access *a) d->func = PCI_FUNC(dfn & 0xff); d->vendor_id = vend >> 16U; d->device_id = vend & 0xffff; - d->hdrtype = pci_read_byte(d, PCI_HEADER_TYPE); - known = PCI_FILL_IDENT; + known = 0; if (!a->buscentric) { - known |= PCI_FILL_IRQ | PCI_FILL_BASES; + known |= PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES; if (cnt >= 10) known |= PCI_FILL_ROM_BASE; if (cnt >= 17) @@ -181,14 +119,26 @@ proc_setup(struct pci_dev *d, int rw) if (a->cached_dev != d || a->fd_rw < rw) { - char buf[256]; + char buf[1024]; + int e; if (a->fd >= 0) close(a->fd); - if (snprintf(buf, sizeof(buf), "%s/%02x/%02x.%d", a->method_params[PCI_ACCESS_PROC_BUS_PCI], - d->bus, d->dev, d->func) == sizeof(buf)) + e = snprintf(buf, sizeof(buf), "%s/%02x/%02x.%d", + pci_get_param(a, "proc.path"), + d->bus, d->dev, d->func); + if (e < 0 || e >= (int) sizeof(buf)) a->error("File name too long"); a->fd_rw = a->writeable || rw; a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY); + if (a->fd < 0) + { + e = snprintf(buf, sizeof(buf), "%s/%04x:%02x/%02x.%d", + pci_get_param(a, "proc.path"), + d->domain, d->bus, d->dev, d->func); + if (e < 0 || e >= (int) sizeof(buf)) + a->error("File name too long"); + a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY); + } if (a->fd < 0) a->warning("Cannot open %s", buf); a->cached_dev = d; @@ -212,10 +162,7 @@ proc_read(struct pci_dev *d, int pos, byte *buf, int len) return 0; } else if (res != len) - { - d->access->warning("proc_read: tried to read %d bytes at %d, but got only %d", len, pos, res); - return 0; - } + return 0; return 1; } @@ -235,7 +182,7 @@ proc_write(struct pci_dev *d, int pos, byte *buf, int len) } else if (res != len) { - d->access->warning("proc_write: tried to write %d bytes at %d, but got only %d", len, pos, res); + d->access->warning("proc_write: tried to write %d bytes at %d, but only %d succeeded", len, pos, res); return 0; } return 1; @@ -249,7 +196,8 @@ proc_cleanup_dev(struct pci_dev *d) } struct pci_methods pm_linux_proc = { - "/proc/bus/pci", + "linux-proc", + "The proc file system on Linux", proc_config, proc_detect, proc_init, @@ -258,6 +206,7 @@ struct pci_methods pm_linux_proc = { pci_generic_fill_info, proc_read, proc_write, + NULL, /* read_vpd */ NULL, /* init_dev */ proc_cleanup_dev };