Attachment 2464 Details for Bug 2373 – legacy I/O patch #6

[patch] legacy I/O patch #6

xorg-legacy-io-6.patch (text/plain), 24.20 KB, created by Jesse Barnes on 2005-04-19 09:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2005-04-19 09:30:01 UTC

Size: 24.20 KB

patch

obsolete

>? os-support/bus/altixPCI.c
>? os-support/bus/altixPCI.h
>Index: common/compiler.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/compiler.h,v
>retrieving revision 1.5
>diff -u -r1.5 compiler.h
>--- common/compiler.h	4 Apr 2005 09:47:07 -0000	1.5
>+++ common/compiler.h	19 Apr 2005 16:25:28 -0000
>@@ -124,7 +124,8 @@
> 
> #  if !defined(__arm__)
> #   if !defined(__sparc__) && !defined(__arm32__) \
>-      && !(defined(__alpha__) && defined(linux))
>+      && !(defined(__alpha__) && defined(linux)) \
>+      && !(defined(__ia64__) && defined(linux)) \
> 
> extern void outb(unsigned short, unsigned char);
> extern void outw(unsigned short, unsigned short);
>@@ -162,7 +163,7 @@
> 
> # ifndef NO_INLINE
> #  ifdef __GNUC__
>-#   if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__alpha__)
>+#   if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))
> 
> #    ifdef linux
> /* for Linux on Alpha, we use the LIBC _inx/_outx routines */
>@@ -494,11 +495,16 @@
> #    undef outb
> #    undef outw
> #    undef outl
>+#    undef inb
>+#    undef inw
>+#    undef inl
>+extern void outb(unsigned long port, unsigned char val);
>+extern void outw(unsigned long port, unsigned short val);
>+extern void outl(unsigned long port, unsigned int val);
>+extern unsigned int inb(unsigned long port);
>+extern unsigned int inw(unsigned long port);
>+extern unsigned int inl(unsigned long port);
>  
>-#    define outb(a,b)	_outb(b,a)
>-#    define outw(a,b)	_outw(b,a)
>-#    define outl(a,b)	_outl(b,a) 
>-
> #   elif defined(linux) && defined(__amd64__) 
>  
> #    include <inttypes.h>
>Index: common/xf86Bus.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v
>retrieving revision 1.5
>diff -u -r1.5 xf86Bus.c
>--- common/xf86Bus.c	28 Jan 2005 16:12:58 -0000	1.5
>+++ common/xf86Bus.c	19 Apr 2005 16:25:28 -0000
>@@ -1857,7 +1857,7 @@
> 	    range.type = (range.type & ~ResAccMask) | (access & ResAccMask);
> 	}
>  	range.type &= ~ResEstimated;	/* Not allowed for drivers */
>-#if !(defined(__alpha__) && defined(linux))
>+#if !((defined(__alpha__) || (defined(__ia64__))) && defined(linux))
> 	/* On Alpha Linux, do not check for conflicts, trust the kernel. */
> 	if (checkConflict(&range, Acc, entityIndex, SETUP,TRUE)) 
> 	    res = xf86AddResToList(res,&range,entityIndex);
>@@ -2477,8 +2477,8 @@
> #endif
>     }
>     xf86FreeResList(acc);
>-
> #if !(defined(__alpha__) && defined(linux)) && \
>+    !(defined(__ia64__) && defined(linux)) && \
>     !(defined(__sparc64__) && defined(__OpenBSD__))
>     /* 
>      * No need to validate on Alpha Linux or OpenBSD/sparc64, 
>Index: common/xf86pciBus.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v
>retrieving revision 1.9
>diff -u -r1.9 xf86pciBus.c
>--- common/xf86pciBus.c	9 Feb 2005 11:12:54 -0000	1.9
>+++ common/xf86pciBus.c	19 Apr 2005 16:25:29 -0000
>@@ -1621,10 +1621,12 @@
> 	    m = m->next;
> 	}
>     } else {
>+#if !defined(__ia64__) /* on ia64, trust the kernel, don't look for overlaps */
> 	if (!xf86IsSubsetOf(range, m) || 
> 	    ChkConflict(&range, avoid, SETUP) 
> 	    || (mem && ChkConflict(&range, mem, SETUP))) 
> 	    ret = 0;
>+#endif 
>     }
> 
>     xf86FreeResList(avoid);
>Index: loader/xf86sym.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v
>retrieving revision 1.9
>diff -u -r1.9 xf86sym.c
>--- loader/xf86sym.c	1 Apr 2005 21:28:50 -0000	1.9
>+++ loader/xf86sym.c	19 Apr 2005 16:25:30 -0000
>@@ -1093,12 +1093,12 @@
> #endif
> #endif
> #if defined(__ia64__)
>-    SYMFUNC(_outw)
>-    SYMFUNC(_outb)
>-    SYMFUNC(_outl)
>-    SYMFUNC(_inb)
>-    SYMFUNC(_inw)
>-    SYMFUNC(_inl)
>+    SYMFUNC(outw)
>+    SYMFUNC(outb)
>+    SYMFUNC(outl)
>+    SYMFUNC(inb)
>+    SYMFUNC(inw)
>+    SYMFUNC(inl)
> #endif
> #if defined(__arm__)
>     SYMFUNC(outw)
>Index: os-support/xf86_OSproc.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v
>retrieving revision 1.3
>diff -u -r1.3 xf86_OSproc.h
>--- os-support/xf86_OSproc.h	28 Jan 2005 16:12:59 -0000	1.3
>+++ os-support/xf86_OSproc.h	19 Apr 2005 16:25:30 -0000
>@@ -256,6 +256,8 @@
> #endif /* NEED_OS_RAC_PROTOS */
> 
> extern Bool xf86GetPciSizeFromOS(PCITAG tag, int indx, int* bits);
>+extern Bool xf86GetPciOffsetFromOS(PCITAG tag, int indx, unsigned long* bases);
>+extern unsigned long xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base);
> 
> extern void xf86MakeNewMapping(int, int, unsigned long, unsigned long, pointer);
> extern void xf86InitVidMem(void);
>Index: os-support/bus/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v
>retrieving revision 1.5
>diff -u -r1.5 Imakefile
>--- os-support/bus/Imakefile	15 Sep 2004 09:23:58 -0000	1.5
>+++ os-support/bus/Imakefile	19 Apr 2005 16:25:30 -0000
>@@ -126,8 +126,8 @@
> PCIARCHOBJ = sparcPci.o
> # endif
> #elif defined(ia64Architecture)
>-PCIARCHSRC = 460gxPCI.c e8870PCI.c zx1PCI.c
>-PCIARCHOBJ = 460gxPCI.o e8870PCI.o zx1PCI.o
>+PCIARCHSRC = 460gxPCI.c e8870PCI.c zx1PCI.c altixPCI.c
>+PCIARCHOBJ = 460gxPCI.o e8870PCI.o zx1PCI.o altixPCI.o
> #endif
> 
> SRCS = Pci.c $(PCIDRVRSRC) $(SBUSDRVSRC) $(PCIARCHSRC)
>Index: os-support/bus/Pci.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v
>retrieving revision 1.4
>diff -u -r1.4 Pci.h
>--- os-support/bus/Pci.h	11 Aug 2004 21:14:17 -0000	1.4
>+++ os-support/bus/Pci.h	19 Apr 2005 16:25:30 -0000
>@@ -254,7 +254,6 @@
> # if defined(linux)
> #  define ARCH_PCI_INIT linuxPciInit
> #  define INCLUDE_XF86_MAP_PCI_MEM
>-#  define INCLUDE_XF86_NO_DOMAIN
> # elif defined(FreeBSD)
> #  define ARCH_PCI_INIT freebsdPciInit
> #  define INCLUDE_XF86_MAP_PCI_MEM
>Index: os-support/bus/linuxPci.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v
>retrieving revision 1.6
>diff -u -r1.6 linuxPci.c
>--- os-support/bus/linuxPci.c	9 Feb 2005 11:12:54 -0000	1.6
>+++ os-support/bus/linuxPci.c	19 Apr 2005 16:25:30 -0000
>@@ -59,6 +59,7 @@
> static CARD32 linuxPciCfgRead(PCITAG tag, int off);
> static void linuxPciCfgWrite(PCITAG, int off, CARD32 val);
> static void linuxPciCfgSetBits(PCITAG tag, int off, CARD32 mask, CARD32 bits);
>+static ADDRESS linuxTransAddrBusToHost(PCITAG tag, PciAddrType type, ADDRESS addr);
> #if defined(__powerpc__)
> static ADDRESS linuxPpcBusAddrToHostAddr(PCITAG, PciAddrType, ADDRESS);
> static ADDRESS linuxPpcHostAddrToBusAddr(PCITAG, PciAddrType, ADDRESS);
>@@ -73,7 +74,7 @@
> /* pciAddrBusToHost */	linuxPpcBusAddrToHostAddr
> #else
> /* pciAddrHostToBus */	pciAddrNOOP,
>-/* pciAddrBusToHost */	pciAddrNOOP
>+/* pciAddrBusToHost */	linuxTransAddrBusToHost
> #endif
> };
> 
>@@ -201,6 +202,26 @@
> 	}
> }
> 
>+/*
>+ * This function will convert a BAR address into a host address
>+ * suitable for passing into the mmap function of a /proc/bus
>+ * device.
>+ */
>+ADDRESS linuxTransAddrBusToHost(PCITAG tag, PciAddrType type, ADDRESS addr)
>+{
>+    ADDRESS ret = xf86GetOSOffsetFromPCI(tag, PCI_MEM|PCI_IO, addr);
>+
>+    if (ret)
>+	return ret;
>+
>+    /*
>+     * if it is not a BAR address, it must be legacy, (or wrong)
>+     * return it as is..
>+     */
>+    return addr;
>+}
>+
>+
> #if defined(__powerpc__)
> 
> #ifndef __NR_pciconfig_iobase
>@@ -442,7 +463,7 @@
> 	if (Flags & VIDMEM_FRAMEBUFFER)
> 	    mmapflags = MAP_SHARED | MAP_WRITECOMBINED;
> 	else
>-	    mmapflags = MAP_SHARED | MAP_NONCACHED
>+	    mmapflags = MAP_SHARED | MAP_NONCACHED;
> 
> #else /* !__ia64__ */
> 
>@@ -467,7 +488,7 @@
> 	result = mmap(NULL, Size + Offset, prot, mmapflags, fd, realBase);
> 
> 	if (!result || ((pointer)result == MAP_FAILED))
>-	    FatalError("linuxMapPci() mmap failure:  %s\n", strerror(errno));
>+	    return NULL;
> 
> 	xf86MakeNewMapping(ScreenNum, Flags, realBase, Size + Offset, result);
> 
>@@ -480,38 +501,134 @@
>     return NULL;
> }
> 
>+#define MAX_DOMAINS 257
>+static pointer DomainMmappedIO[MAX_DOMAINS];
>+static pointer DomainMmappedMem[MAX_DOMAINS];
>+
>+static int
>+linuxOpenLegacy(PCITAG Tag, char *name)
>+{
>+#define PREFIX "/sys/class/pci_bus/%04x:%02x/%s"
>+    char *path;
>+    int domain, bus;
>+    pciBusInfo_t *pBusInfo;
>+    pciConfigPtr bridge = NULL;
>+    int fd;
>+
>+    path = xalloc(strlen(PREFIX) + strlen(name));
>+    if (!path)
>+	return -1;
>+
>+    for (;;) {
>+	domain = xf86GetPciDomain(Tag);
>+	bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag));
>+
>+	/* Domain 0 is reserved -- see xf86GetPciDomain() */
>+	if ((domain <= 0) || (domain >= MAX_DOMAINS))
>+	    FatalError("linuxOpenLegacy():  domain out of range\n");
>+
>+	sprintf(path, PREFIX, domain - 1, bus, name);
>+	fd = open(path, O_RDWR);
>+	if (fd >= 0) {
>+	    xfree(path);
>+	    return fd;
>+	}
>+
>+	pBusInfo = pciBusInfo[bus];
>+	if (!pBusInfo || (bridge == pBusInfo->bridge) ||
>+		!(bridge = pBusInfo->bridge)) {
>+	    xfree(path);
>+	    return -1;
>+	}
>+
>+	Tag = bridge->tag;
>+    }
>+
>+    xfree(path);
>+    return fd;
>+}
>+
>+/*
>+ * xf86MapDomainMemory - memory map PCI domain memory
>+ *
>+ * This routine maps the memory region in the domain specified by Tag and
>+ * returns a pointer to it.  The pointer is saved for future use if it's in
>+ * the legacy ISA memory space (memory in a domain between 0 and 1MB).
>+ */
> pointer
> xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
> 		    ADDRESS Base, unsigned long Size)
> {
>-    return linuxMapPci(ScreenNum, Flags, Tag, Base, Size, PCIIOC_MMAP_IS_MEM);
>-}
>+    int domain = xf86GetPciDomain(Tag);
>+    int fd;
> 
>-#define MAX_DOMAINS 257
>-static pointer DomainMmappedIO[MAX_DOMAINS];
>+    /*
>+     * We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs
>+     * legacy_mem interface is unavailable.
>+     */
>+    if (Base > 1024*1024 || (fd = linuxOpenLegacy(Tag, "legacy_mem") < 0))
>+	return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
>+			   PCIIOC_MMAP_IS_MEM);
>+
>+    /* If we haven't already mapped this legacy space, try to. */
>+    if (!DomainMmappedMem[domain]) {
>+	DomainMmappedMem[domain] = mmap(0, 1024*1024, PROT_READ|PROT_WRITE,
>+					MAP_SHARED, fd, 0);
>+	if (!DomainMmappedMem[domain]) {
>+	    close(fd);
>+	    FatalError("xf86MapDomainMem():  mmap() failure\n");
>+	}
>+    }
>+
>+    close(fd);
>+    return (pointer)((char *)DomainMmappedMem[domain] + Base);
>+}
> 
>-/* This has no means of returning failure, so all errors are fatal */
>+/*
>+ * xf86MapDomainIO - map I/O space in this domain
>+ *
>+ * Each domain has a legacy ISA I/O space.  This routine will try to
>+ * map it using the Linux sysfs legacy_io interface.  If that fails,
>+ * it'll fall back to using /proc/bus/pci.
>+ *
>+ * If the legacy_io interface *does* exist, the file descriptor (fd below)
>+ * will be saved in the DomainMmappedIO array in the upper bits of the
>+ * pointer.  Callers will do I/O with small port numbers (<64k values), so
>+ * the platform I/O code can extract the port number and the fd, lseek to
>+ * the port number in the legacy_io file, and issue the read or write.
>+ *
>+ * This has no means of returning failure, so all errors are fatal
>+ */
> IOADDRESS
> xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag,
> 		IOADDRESS Base, unsigned long Size)
> {
>     int domain = xf86GetPciDomain(Tag);
>+    int fd;
> 
>     if ((domain <= 0) || (domain >= MAX_DOMAINS))
> 	FatalError("xf86MapDomainIO():  domain out of range\n");
> 
>     /* Permanently map all of I/O space */
>     if (!DomainMmappedIO[domain]) {
>-	DomainMmappedIO[domain] = linuxMapPci(ScreenNum, Flags, Tag,
>-					      0, linuxGetIOSize(Tag),
>-					      PCIIOC_MMAP_IS_IO);
>-	if (!DomainMmappedIO[domain])
>-	    FatalError("xf86MapDomainIO():  mmap() failure\n");
>+        if ((fd = linuxOpenLegacy(Tag, "legacy_io")) >= 0)
>+	    DomainMmappedIO[domain] = (pointer)(fd << 24);
>+	else {
>+	    DomainMmappedIO[domain] = linuxMapPci(ScreenNum, Flags, Tag,
>+						  0, linuxGetIOSize(Tag),
>+						  PCIIOC_MMAP_IS_IO);
>+	    /* ia64 can't mmap legacy IO port space */
>+	    if (!DomainMmappedIO[domain])
>+		return Base;
>+	}
>     }
> 
>     return (IOADDRESS)DomainMmappedIO[domain] + Base;
> }
> 
>+/*
>+ * xf86ReadDomainMemory - copy from domain memory into a caller supplied buffer
>+ */
> int
> xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf)
> {
>@@ -520,6 +637,39 @@
>     unsigned long size;
>     int len, pagemask = getpagesize() - 1;
> 
>+    unsigned int i, dom, bus, dev, func;
>+    unsigned int fd;
>+    char file[256];
>+    struct stat st;
>+
>+    dom  = PCI_DOM_FROM_TAG(Tag);
>+    bus  = PCI_BUS_FROM_TAG(Tag);
>+    dev  = PCI_DEV_FROM_TAG(Tag);
>+    func = PCI_FUNC_FROM_TAG(Tag);
>+    sprintf(file, "/sys/devices/pci%04x:%02x/%04x:%02x:%02x.%1x/rom",
>+	    dom, bus, dom, bus, dev, func);
>+
>+    /*
>+     * If the caller wants the ROM and the sysfs rom interface exists,
>+     * try to use it instead of reading it from /proc/bus/pci.
>+     */
>+    if (((Base & 0xfffff) == 0xC0000) && (stat(file, &st) == 0)) {
>+        if ((fd = open(file, O_RDWR)))
>+            Base = 0x0;
>+
>+	/* enable the ROM first */
>+	write(fd, "1", 2);
>+
>+        /* copy the ROM until we hit Len, EOF or read error */
>+        for (i = 0; i < Len && read(fd, Buf, 1) > 0; Buf++, i++)
>+            ;
>+
>+	write(fd, "0", 2);
>+	close(fd);
>+
>+	return Len;
>+    }
>+
>     /* Ensure page boundaries */
>     offset = Base & ~pagemask;
>     size = ((Base + Len + pagemask) & ~pagemask) - offset;
>Index: os-support/linux/lnx_ia64.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ia64.c,v
>retrieving revision 1.1
>diff -u -r1.1 lnx_ia64.c
>--- os-support/linux/lnx_ia64.c	15 Sep 2004 09:23:59 -0000	1.1
>+++ os-support/linux/lnx_ia64.c	19 Apr 2005 16:25:30 -0000
>@@ -26,6 +26,7 @@
> 
> #include <sys/types.h>
> #include <sys/stat.h>
>+#include <sys/utsname.h>
> #include <unistd.h>
> 
> #include "ia64Pci.h"
>@@ -35,11 +36,24 @@
> IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags)
> {
>     struct stat unused;
>+    struct utsname utsName;
> 
>     if (!stat("/proc/bus/mckinley/zx1",&unused) 
> 	|| !stat("/proc/bus/mckinley/zx2",&unused))
> 	return ZX1_CHIPSET;
> 
>+    if (!stat("/proc/sgi_sn/licenseID", &unused)) {
>+	/*
>+	 * We need a 2.6.11 or better kernel for Altix support
>+	 */
>+	uname(&utsName);
>+	if (!strstr(utsName.release, "2.6.11")) {
>+	    ErrorF("Kernel 2.6.11 or better needed for Altix support\n");
>+	    return NONE_CHIPSET;
>+	}
>+	return ALTIX_CHIPSET;
>+    }
>+
>     return NONE_CHIPSET;
> }
> #endif
>Index: os-support/linux/lnx_pci.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v
>retrieving revision 1.2
>diff -u -r1.2 lnx_pci.c
>--- os-support/linux/lnx_pci.c	23 Apr 2004 19:54:08 -0000	1.2
>+++ os-support/linux/lnx_pci.c	19 Apr 2005 16:25:30 -0000
>@@ -83,3 +83,141 @@
>     fclose(file);
>     return FALSE;
> }
>+
>+
>+
>+/* Query the kvirt address (64bit) of a BAR range from TAG */
>+Bool
>+xf86GetPciOffsetFromOS(PCITAG tag, int index, unsigned long* bases)
>+{
>+    FILE *file;
>+    char c[0x200];
>+    char *res;
>+    unsigned int bus, devfn, dev, fn;
>+    unsigned PCIADDR_TYPE offset[7];
>+    unsigned int num;
>+
>+    if (index > 7)
>+        return FALSE;
>+
>+    if (!(file = fopen("/proc/bus/pci/devices","r")))
>+        return FALSE;
>+    do {
>+        res = fgets(c,0x1ff,file);
>+        if (res) {
>+            num = sscanf(res,
>+                         /*bus+dev vendorid deviceid irq */
>+                         "%02x%02x\t%*04x%*04x\t%*x"
>+                         /* 7 PCI resource base addresses */
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         /* 7 PCI resource sizes, and then optionally a driver name */
>+                         "\t" PCIADDR_IGNORE_FMT
>+                         "\t" PCIADDR_IGNORE_FMT
>+                         "\t" PCIADDR_IGNORE_FMT
>+                         "\t" PCIADDR_IGNORE_FMT
>+                         "\t" PCIADDR_IGNORE_FMT
>+                         "\t" PCIADDR_IGNORE_FMT
>+                         "\t" PCIADDR_IGNORE_FMT,
>+                         &bus,&devfn,&offset[0],&offset[1],&offset[2],&offset[3],
>+                         &offset[4],&offset[5],&offset[6]);
>+            if (num != 9) {  /* apparantly not 2.3 style */
>+                fclose(file);
>+                return FALSE;
>+            }
>+
>+            dev = devfn >> 3;
>+            fn = devfn & 0x7;
>+            if (tag == pciTag(bus,dev,fn)) {
>+                /* return the offset for the index requested */
>+                *bases = offset[index];
>+                fclose(file);
>+                return TRUE;
>+            }
>+        }
>+    } while (res);
>+
>+    fclose(file);
>+    return FALSE;
>+}
>+
>+/* Query the kvirt address (64bit) of a BAR range from size for a given TAG */
>+unsigned long
>+xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base)
>+{
>+    FILE *file;
>+    char c[0x200];
>+    char *res;
>+    unsigned int bus, devfn, dev, fn;
>+    unsigned PCIADDR_TYPE offset[7];
>+    unsigned PCIADDR_TYPE size[7];
>+    unsigned int num;
>+    unsigned int ndx;
>+
>+    if (!(file = fopen("/proc/bus/pci/devices","r")))
>+        return NULL;
>+    do {
>+        res = fgets(c,0x1ff,file);
>+        if (res) {
>+            num = sscanf(res,
>+                         /*bus+dev vendorid deviceid irq */
>+                         "%02x%02x\t%*04x%*04x\t%*x"
>+                         /* 7 PCI resource base addresses */
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         /* 7 PCI resource sizes, and then optionally a driver name */
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT
>+                         "\t" PCIADDR_FMT,
>+                         &bus,&devfn,&offset[0],&offset[1],&offset[2],&offset[3],
>+                         &offset[4],&offset[5],&offset[6], &size[0], &size[1], &size[2],
>+		         &size[3], &size[4], &size[5], &size[6]);
>+            if (num != 16) {  /* apparantly not 2.3 style */
>+                fclose(file);
>+                return NULL;
>+            }
>+
>+            dev = devfn >> 3;
>+            fn = devfn & 0x7;
>+            if (tag == pciTag(bus,dev,fn)) {
>+                /* ok now look through all the BAR values of this device */
>+                for (ndx=0; ndx<7; ndx++) {
>+                    unsigned long savePtr;
>+                    /*
>+		     * remember to lop of the last 4bits of the BAR values as they are
>+		     * memory attributes
>+		     */
>+		    if (ndx == 6) 
>+			savePtr = (0xFFFFFFF0) & 
>+			    pciReadLong(tag, PCI_CMD_BIOS_REG);
>+		    else /* this the ROM bar */
>+			savePtr = (0xFFFFFFF0) & 
>+			    pciReadLong(tag, PCI_CMD_BASE_REG + (0x4 * ndx));
>+                    /* find the index of the incoming base */
>+                    if (base >= savePtr && base <= (savePtr + size[ndx])) {
>+                        fclose(file);
>+                        return ( ~(0xFUL) & (offset[ndx] + (base - savePtr)));
>+                    }
>+                }
>+            }
>+        }
>+    } while (res);
>+
>+    fclose(file);
>+    return NULL;
>+
>+}
>Index: os-support/shared/ia64Pci.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/ia64Pci.c,v
>retrieving revision 1.1
>diff -u -r1.1 ia64Pci.c
>--- os-support/shared/ia64Pci.c	15 Sep 2004 09:23:59 -0000	1.1
>+++ os-support/shared/ia64Pci.c	19 Apr 2005 16:25:30 -0000
>@@ -29,12 +29,165 @@
>  * This file contains the glue needed to support various IA-64 chipsets.
>  */
> 
>+#include <fcntl.h>
>+#include <unistd.h>
>+#include <signal.h>
>+#include <dirent.h>
>+#include <sys/types.h>
>+#include <sys/stat.h>
>+#include <sys/ioctl.h>
>+#include <linux/pci.h>
>+
>+#include "compiler.h"
> #include "460gxPCI.h"
> #include "e8870PCI.h"
> #include "zx1PCI.h"
>+#include "altixPCI.h"
> #include "Pci.h"
> #include "ia64Pci.h"
> 
>+/*
>+ * We use special in/out routines here since Altix platforms require the
>+ * use of the sysfs legacy_io interface.  The legacy_io file maps to the I/O
>+ * space of a given PCI domain; reads and writes are used to do port I/O.
>+ * The file descriptor for the file is stored in the upper bits of the
>+ * value passed in by the caller, and is created and populated by
>+ * xf86MapDomainIO.
>+ *
>+ * If the legacy_io interface doesn't exist, we fall back to the glibc in/out
>+ * routines, which are prefixed by an underscore (e.g. _outb).
>+ */
>+static int ia64_port_to_fd(unsigned long port)
>+{
>+    return (port >> 24) & 0xffffffff;
>+}
>+
>+void outb(unsigned long port, unsigned char val)
>+{
>+    int fd = ia64_port_to_fd(port);
>+
>+    if (!fd) {
>+	_outb(port & 0xffff, val);
>+	goto out;
>+    }
>+    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
>+	ErrorF("I/O lseek failed\n");
>+	goto out;
>+    }
>+    if (write(fd, &val, 1) != 1) {
>+	ErrorF("I/O write failed\n");
>+	goto out;
>+    }
>+ out:
>+    return;
>+}
>+
>+void outw(unsigned long port, unsigned short val)
>+{
>+    int fd = ia64_port_to_fd(port);
>+
>+    if (!fd) {
>+	_outw(port & 0xffff, val);
>+	goto out;
>+    }
>+    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
>+	ErrorF("I/O lseek failed\n");
>+	goto out;
>+    }
>+    if (write(fd, &val, 2) != 2) {
>+	ErrorF("I/O write failed\n");
>+	goto out;
>+    }
>+ out:
>+    return;
>+}
>+
>+void outl(unsigned long port, unsigned int val)
>+{
>+    int fd = ia64_port_to_fd(port);
>+
>+    if (!fd) {
>+	_outl(port & 0xffff, val);
>+	goto out;
>+    }
>+    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
>+	ErrorF("I/O lseek failed\n");
>+	goto out;
>+    }
>+    if (write(fd, &val, 4) != 4) {
>+	ErrorF("I/O write failed\n");
>+	goto out;
>+    }
>+ out:
>+    return;
>+}
>+
>+unsigned int inb(unsigned long port)
>+{
>+    int fd = ia64_port_to_fd(port);
>+    unsigned char val;
>+
>+    if (!fd)
>+	return _inb(port & 0xffff);
>+
>+    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
>+	ErrorF("I/O lseek failed\n");
>+	val = -1;
>+	goto out;
>+    }
>+    if (read(fd, &val, 1) != 1) {
>+	ErrorF("I/O read failed\n");
>+	val = -1;
>+	goto out;
>+    }
>+ out:
>+    return val;
>+}
>+
>+unsigned int inw(unsigned long port)
>+{
>+    int fd = ia64_port_to_fd(port);
>+    unsigned short val;
>+
>+    if (!fd)
>+	return _inw(port & 0xffff);
>+
>+    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
>+	ErrorF("I/O lseek failed\n");
>+	val = -1;
>+	goto out;
>+    }
>+    if (read(fd, &val, 2) != 2) {
>+	ErrorF("I/O read failed\n");
>+	val = -1;
>+	goto out;
>+    }
>+ out:
>+    return val;
>+}
>+
>+unsigned int inl(unsigned long port)
>+{
>+    int fd = ia64_port_to_fd(port);
>+    unsigned int val;
>+
>+    if (!fd)
>+	return _inl(port & 0xffff);
>+
>+    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
>+	ErrorF("I/O lseek failed\n");
>+	val = -1;
>+	goto out;
>+    }
>+    if (read(fd, &val, 4) != 4) {
>+	ErrorF("I/O read failed\n");
>+	val = -1;
>+	goto out;
>+    }
>+ out:
>+    return val;
>+}
>+
> void
> ia64ScanPCIWrapper(scanpciWrapperOpt flags)
> {
>@@ -58,6 +211,9 @@
> 	    case ZX1_CHIPSET:
> 		xf86PreScanZX1();
> 		return;
>+	    case ALTIX_CHIPSET:
>+		xf86PreScanAltix();
>+		return;
> 	    default:
> 		return;
> 	}
>@@ -74,6 +230,9 @@
> 	    case ZX1_CHIPSET:
> 		xf86PostScanZX1();
> 		return;
>+	    case ALTIX_CHIPSET:
>+		xf86PostScanAltix();
>+		return;
> 	    default:
> 		return;
> 	}
>Index: os-support/shared/ia64Pci.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/ia64Pci.h,v
>retrieving revision 1.1
>diff -u -r1.1 ia64Pci.h
>--- os-support/shared/ia64Pci.h	15 Sep 2004 09:23:59 -0000	1.1
>+++ os-support/shared/ia64Pci.h	19 Apr 2005 16:25:30 -0000
>@@ -32,7 +32,8 @@
>     NONE_CHIPSET,
>     I460GX_CHIPSET,
>     E8870_CHIPSET,
>-    ZX1_CHIPSET
>+    ZX1_CHIPSET,
>+    ALTIX_CHIPSET
> } IA64Chipset;
> 
> # ifdef OS_PROBE_PCI_CHIPSET

Actions: View | Splinter Review

Attachments on bug 2373: 1748 | 2425 | 2432 | 2461 | 2464 | 2478 | 2480 | 2483 | 2498 | 2508 | 2645 | 2673 | 2902 | 4983

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.