frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Solaris mapping code to work with standard shared/vidmem.c 

Also merge sun_bios.c into sun_vid.c and upstream Solaris patch to
keep aperture device open, to allow mappings to occur after X server
has given up uid 0.
This commit is contained in:
Alan Coopersmith 2008-10-30 20:38:34 -07:00
parent 2809a56b4b
commit 70e18a3b6b
3 changed files with 206 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/os-support/solaris/Makefile.am
View File

@ -18,11 +18,12 @@ solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S
$(CPP) -P -DINLINE_ASM solaris-@SOLARIS_INOUT_ARCH@.S > $@ $(CPP) -P -DINLINE_ASM solaris-@SOLARIS_INOUT_ARCH@.S > $@
noinst_LTLIBRARIES = libsolaris.la noinst_LTLIBRARIES = libsolaris.la
libsolaris_la_SOURCES = sun_bios.c sun_init.c \ libsolaris_la_SOURCES = sun_init.c \
sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \ sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \
$(srcdir)/../shared/kmod_noop.c \ $(srcdir)/../shared/kmod_noop.c \
$(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \ $(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \
$(srcdir)/../shared/stdResource.c \ $(srcdir)/../shared/stdResource.c \
$(srcdir)/../shared/vidmem.c \
$(VTSW_SRC) $(VTSW_SRC)
nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)

103
hw/xfree86/os-support/solaris/sun_bios.c
View File

@ -1,103 +0,0 @@
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
* Copyright 1999 by David Holland <davidh@iquest.net>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that copyright
* notice and this permission notice appear in supporting documentation, and
* that the names of the copyright holders not be used in advertising or
* publicity pertaining to distribution of the software without specific,
* written prior permission. The copyright holders make no representations
* about the suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
* SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#if defined(__i386__) || defined(__i386)
#define _NEED_SYSI86
#endif
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
#ifndef MAP_FAILED
#define MAP_FAILED ((void *)-1)
#endif
extern char *apertureDevName;
/*
* Read BIOS via mmap()ing physical memory.
*/
_X_EXPORT int
xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
int Len)
{
int fd;
unsigned char *ptr;
char solx86_vtname[20];
int psize;
int mlen;
/*
* Solaris 2.1 x86 SVR4 (10/27/93)
* The server must treat the virtual terminal device file
* as the standard SVR4 /dev/pmem. By default, then used VT
* is considered the "default" file to open.
*
* Solaris 2.8 x86 (7/26/99) - DWH
*
* Use /dev/xsvc for everything.
*/
psize = getpagesize();
Offset += Base & (psize - 1);
Base &= ~(psize - 1);
mlen = (Offset + Len + psize - 1) & ~(psize - 1);
#if (defined(__i386__) || defined(__i386)) && !defined(__SOL8__)
if (Base >= 0xA0000 && Base + mlen < 0xFFFFF && xf86Info.vtno >= 0)
sprintf(solx86_vtname, "/dev/vt%02d", xf86Info.vtno);
else
#endif
{
if (!xf86LinearVidMem())
FatalError("xf86ReadBIOS: Could not mmap BIOS"
" [a=%lx]\n", Base);
sprintf(solx86_vtname, apertureDevName);
}
if ((fd = open(solx86_vtname, O_RDONLY)) < 0)
{
xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
solx86_vtname, strerror(errno));
return(-1);
}
ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
MAP_SHARED, fd, (off_t)Base);
if (ptr == MAP_FAILED)
{
xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed "
"[0x%08lx, 0x%04x]\n",
solx86_vtname, Base, mlen);
close(fd);
return -1;
}
(void)memcpy(Buf, (void *)(ptr + Offset), Len);
(void)munmap((caddr_t)ptr, mlen);
(void)close(fd);
return Len;
}

252
hw/xfree86/os-support/solaris/sun_vid.c
View File

@ -1,6 +1,7 @@
/* /*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org> * Copyright 1993 by David Wexelblat <dwex@goblin.org>
* Copyright 1999 by David Holland <davidh@iquest.net>
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that * documentation for any purpose is hereby granted without fee, provided that
@ -21,6 +22,33 @@
* OF THIS SOFTWARE. * OF THIS SOFTWARE.
* *
*/ */
/* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*/
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
@ -34,115 +62,170 @@
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include "xf86OSpriv.h"
#ifndef MAP_FAILED #include <sys/mman.h>
#define MAP_FAILED ((void *)-1)
#endif
/***************************************************************************/ /***************************************************************************/
/* Video Memory Mapping section */ /* Video Memory Mapping section */
/***************************************************************************/ /***************************************************************************/
char *apertureDevName = NULL; static char *apertureDevName = NULL;
static int apertureDevFD_ro = -1;
static int apertureDevFD_rw = -1;
_X_EXPORT Bool static Bool
xf86LinearVidMem(void) solOpenAperture(void)
{
if (apertureDevName == NULL)
{ {
int mmapFd;
if (apertureDevName)
return TRUE;
apertureDevName = "/dev/xsvc"; apertureDevName = "/dev/xsvc";
if ((mmapFd = open(apertureDevName, O_RDWR)) < 0) if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)
{
apertureDevName = "/dev/fbs/aperture";
if((mmapFd = open(apertureDevName, O_RDWR)) < 0)
{ {
xf86MsgVerb(X_WARNING, 0, xf86MsgVerb(X_WARNING, 0,
"xf86LinearVidMem: failed to open %s (%s)\n", "solOpenAperture: failed to open %s (%s)\n",
apertureDevName, strerror(errno));
apertureDevName = "/dev/fbs/aperture";
apertureDevFD_rw = open(apertureDevName, O_RDWR);
}
apertureDevFD_ro = open(apertureDevName, O_RDONLY);
if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))
{
xf86MsgVerb(X_WARNING, 0,
"solOpenAperture: failed to open %s (%s)\n",
apertureDevName, strerror(errno)); apertureDevName, strerror(errno));
xf86MsgVerb(X_WARNING, 0, xf86MsgVerb(X_WARNING, 0,
"xf86LinearVidMem: either /dev/fbs/aperture or /dev/xsvc" "solOpenAperture: either /dev/fbs/aperture"
" device driver required\n"); " or /dev/xsvc required\n");
xf86MsgVerb(X_WARNING, 0,
"xf86LinearVidMem: linear memory access disabled\n");
apertureDevName = NULL; apertureDevName = NULL;
if (apertureDevFD_rw >= 0)
{
close(apertureDevFD_rw);
}
apertureDevFD_rw = -1;
if (apertureDevFD_ro >= 0)
{
close(apertureDevFD_ro);
}
apertureDevFD_ro = -1;
return FALSE; return FALSE;
} }
} }
close(mmapFd);
return TRUE; return TRUE;
} }
_X_EXPORT pointer static pointer
xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size) solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
{ {
pointer base; pointer base;
int fd; int fd;
char vtname[20]; int prot;
/* if (Flags & VIDMEM_READONLY)
* Solaris 2.1 x86 SVR4 (10/27/93)
* The server must treat the virtual terminal device file as the
* standard SVR4 /dev/pmem.
*
* Using the /dev/vtXX device as /dev/pmem only works for the
* A0000-FFFFF region - If we wish you mmap the linear aperture
* it requires a device driver.
*
* So what we'll do is use /dev/vtXX for the A0000-FFFFF stuff, and
* try to use the /dev/fbs/aperture or /dev/xsvc driver if the server
* tries to mmap anything > FFFFF. Its very very unlikely that the
* server will try to mmap anything below FFFFF that can't be handled
* by /dev/vtXX.
*
* DWH - 2/23/94
* DWH - 1/31/99 (Gee has it really been 5 years?)
*
* Solaris 2.8 7/26/99
* Use /dev/xsvc for everything
*
* DWH - 7/26/99 - Solaris8/dev/xsvc changes
*
* TSI - 2001.09 - SPARC changes
*/
#if defined(__i386__) && !defined(__SOL8__)
if(Base < 0xFFFFF)
sprintf(vtname, "/dev/vt%02d", xf86Info.vtno);
else
#endif
{ {
if (!xf86LinearVidMem()) fd = apertureDevFD_ro;
FatalError("xf86MapVidMem: no aperture device\n"); prot = PROT_READ;
}
strcpy(vtname, apertureDevName); else
{
fd = apertureDevFD_rw;
prot = PROT_READ | PROT_WRITE;
} }
fd = open(vtname, (Flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
if (fd < 0) if (fd < 0)
FatalError("xf86MapVidMem: failed to open %s (%s)\n", {
vtname, strerror(errno)); xf86DrvMsg(ScreenNum, X_ERROR,
"solMapVidMem: failed to open %s (%s)\n",
apertureDevName, strerror(errno));
return NULL;
}
base = mmap(NULL, Size, base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);
(Flags & VIDMEM_READONLY) ?
PROT_READ : (PROT_READ | PROT_WRITE),
MAP_SHARED, fd, (off_t)Base);
close(fd);
if (base == MAP_FAILED)
FatalError("xf86MapVidMem: mmap failure: %s\n",
strerror(errno));
return(base); if (base == MAP_FAILED) {
xf86DrvMsg(ScreenNum, X_ERROR,
"solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",
apertureDevName, Base, Size, strerror(errno));
return NULL;
}
return base;
} }
/* ARGSUSED */ /* ARGSUSED */
_X_EXPORT void static void
xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size) solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
{ {
munmap(Base, Size); if (munmap(Base, Size) != 0) {
xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,
"solUnMapVidMem: failed to unmap %s"
" (0x%08lx,0x%lx) (%s)\n",
apertureDevName, Base, Size,
strerror(errno));
} }
}
_X_HIDDEN void
xf86OSInitVidMem(VidMemInfoPtr pVidMem)
{
pVidMem->linearSupported = solOpenAperture();
if (pVidMem->linearSupported) {
pVidMem->mapMem = solMapVidMem;
pVidMem->unmapMem = solUnMapVidMem;
} else {
xf86MsgVerb(X_WARNING, 0,
"xf86OSInitVidMem: linear memory access disabled\n");
}
pVidMem->initialised = TRUE;
}
/*
* Read BIOS via mmap()ing physical memory.
*/
_X_EXPORT int
xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
int Len)
{
unsigned char *ptr;
int psize;
int mlen;
psize = getpagesize();
Offset += Base & (psize - 1);
Base &= ~(psize - 1);
mlen = (Offset + Len + psize - 1) & ~(psize - 1);
if (solOpenAperture() == FALSE)
{
xf86Msg(X_WARNING,
"xf86ReadBIOS: Failed to open aperture to read BIOS\n");
return -1;
}
ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,
MAP_SHARED, apertureDevFD_ro, (off_t)Base);
if (ptr == MAP_FAILED)
{
xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",
apertureDevName, Base, mlen);
return -1;
}
(void)memcpy(Buf, (void *)(ptr + Offset), Len);
if (munmap((caddr_t)ptr, mlen) != 0) {
xf86MsgVerb(X_WARNING, 0,
"solUnMapVidMem: failed to unmap %s"
" (0x%08lx,0x%lx) (%s)\n",
apertureDevName, ptr, mlen, strerror(errno));
}
return Len;
}
/***************************************************************************/ /***************************************************************************/
/* I/O Permissions section */ /* I/O Permissions section */
@ -186,7 +269,8 @@ xf86DisableIO(void)
/* Interrupt Handling section */ /* Interrupt Handling section */
/***************************************************************************/ /***************************************************************************/
_X_EXPORT Bool xf86DisableInterrupts(void) _X_EXPORT Bool
xf86DisableInterrupts(void)
{ {
#if defined(__i386__) || defined(__i386) || defined(__x86) #if defined(__i386__) || defined(__i386) || defined(__x86)
if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0)) if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
@ -205,7 +289,8 @@ _X_EXPORT Bool xf86DisableInterrupts(void)
return TRUE; return TRUE;
} }
_X_EXPORT void xf86EnableInterrupts(void) _X_EXPORT void
xf86EnableInterrupts(void)
{ {
#if defined(__i386__) || defined(__i386) || defined(__x86) #if defined(__i386__) || defined(__i386) || defined(__x86)
if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0)) if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
@ -221,16 +306,3 @@ _X_EXPORT void xf86EnableInterrupts(void)
sysi86(SI86V86, V86SC_IOPL, 0); sysi86(SI86V86, V86SC_IOPL, 0);
#endif /* i386 */ #endif /* i386 */
} }
_X_EXPORT void
xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base,
unsigned long Size)
{
}
_X_EXPORT Bool
xf86CheckMTRR(int ScreenNum)
{
return FALSE;
}