d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use io(4) for I/O port access on ia64, rather than through sysarch(2).

Browse Source 
I/O port access is implemented on Itanium by reading and writing to a
special region in memory. To hide details and avoid misaligned memory
accesses, a process did I/O port reads and writes by making a MD system
call. There's one fatal problem with this approach: unprivileged access
was not being prevented. /dev/io serves that purpose on amd64/i386, so
employ it on ia64 as well. Use an ioctl for doing the actual I/O and
remove the sysarch(2) interface.

Backward compatibility is not being considered. The sysarch(2) approach
was added to support X11, but support for FreeBSD/ia64 was never fully
implemented in X11. Thus, nothing gets broken that didn't need more work
to begin with.

MFC after:	1 week
This commit is contained in:
Marcel Moolenaar 2010-01-11 18:10:13 +00:00
parent 5f5bb1d11a
commit 409a390c33
11 changed files with 235 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/amd64/amd64/io.c
View File

@ -76,3 +76,12 @@ ioclose(struct cdev *dev __unused, int flags __unused, int fmt __unused,
return (0);
}
/* ARGSUSED */
int
ioioctl(struct cdev *dev __unused, u_long cmd __unused, caddr_t data __unused,
int fflag __unused, struct thread *td __unused)
{
return (ENXIO);
}

1
sys/amd64/include/iodev.h
View File

@ -28,3 +28,4 @@
d_open_t ioopen;
d_close_t ioclose;
d_ioctl_t ioioctl;

2
sys/conf/files.ia64
View File

@ -54,6 +54,7 @@ dev/atkbdc/psm.c optional psm atkbdc
dev/fb/fb.c optional fb | vga
dev/fb/vga.c optional vga
dev/hwpmc/hwpmc_ia64.c optional hwpmc
dev/io/iodev.c optional io
dev/kbd/kbd.c optional atkbd | sc | ukbd | usb2_input_kbd
dev/syscons/scterm-teken.c optional sc
dev/syscons/scvgarndr.c optional sc vga
@ -86,6 +87,7 @@ ia64/ia64/gdb_machdep.c optional gdb
ia64/ia64/highfp.c standard
ia64/ia64/in_cksum.c optional inet
ia64/ia64/interrupt.c standard
ia64/ia64/iodev_machdep.c optional io
ia64/ia64/locore.S standard no-obj
ia64/ia64/machdep.c standard
ia64/ia64/mca.c standard

3
sys/dev/io/iodev.c
View File

@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/uio.h>
#include <machine/specialreg.h>
#include <vm/vm.h>
#include <vm/pmap.h>
@ -54,6 +52,7 @@ static struct cdevsw io_cdevsw = {
.d_version = D_VERSION,
.d_open = ioopen,
.d_close = ioclose,
.d_ioctl = ioioctl,
.d_name = "io",
};

9
sys/i386/i386/io.c
View File

@ -76,3 +76,12 @@ ioclose(struct cdev *dev __unused, int flags __unused, int fmt __unused,
return (0);
}
/* ARGSUSED */
int
ioioctl(struct cdev *dev __unused, u_long cmd __unused, caddr_t data __unused,
int fflag __unused, struct thread *td __unused)
{
return (ENXIO);
}

1
sys/i386/include/iodev.h
View File

@ -28,3 +28,4 @@
d_open_t ioopen;
d_close_t ioclose;
d_ioctl_t ioioctl;

1
sys/ia64/conf/DEFAULTS
View File

@ -9,6 +9,7 @@ machine ia64
device acpi # ACPI support
# Pseudo devices.
device io # I/O & EFI runtime device
device mem # Memory and kernel memory devices
# UART chips on this platform

160
sys/ia64/ia64/iodev_machdep.c Normal file
View File

@ -0,0 +1,160 @@
/*-
* Copyright (c) 2010 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/ioccom.h>
#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/systm.h>
#include <machine/bus.h>
#include <machine/iodev.h>
static int iodev_pio_read(struct iodev_pio_req *req);
static int iodev_pio_write(struct iodev_pio_req *req);
/* ARGSUSED */
int
ioopen(struct cdev *dev __unused, int flags __unused, int fmt __unused,
struct thread *td)
{
int error;
error = priv_check(td, PRIV_IO);
if (error == 0)
error = securelevel_gt(td->td_ucred, 0);
return (error);
}
/* ARGSUSED */
int
ioclose(struct cdev *dev __unused, int flags __unused, int fmt __unused,
struct thread *td __unused)
{
return (0);
}
/* ARGSUSED */
int
ioioctl(struct cdev *dev __unused, u_long cmd, caddr_t data,
int fflag __unused, struct thread *td __unused)
{
struct iodev_pio_req *pio_req;
int error;
error = ENOIOCTL;
switch (cmd) {
case IODEV_PIO:
pio_req = (struct iodev_pio_req *)data;
switch (pio_req->access) {
case IODEV_PIO_READ:
error = iodev_pio_read(pio_req);
break;
case IODEV_PIO_WRITE:
error = iodev_pio_write(pio_req);
break;
default:
error = EINVAL;
break;
}
break;
}
return (error);
}
static int
iodev_pio_read(struct iodev_pio_req *req)
{
switch (req->width) {
case 1:
req->val = bus_space_read_io_1(req->port);
break;
case 2:
if (req->port & 1) {
req->val = bus_space_read_io_1(req->port);
req->val |= bus_space_read_io_1(req->port + 1) << 8;
} else
req->val = bus_space_read_io_2(req->port);
break;
case 4:
if (req->port & 1) {
req->val = bus_space_read_io_1(req->port);
req->val |= bus_space_read_io_2(req->port + 1) << 8;
req->val |= bus_space_read_io_1(req->port + 3) << 24;
} else if (req->port & 2) {
req->val = bus_space_read_io_2(req->port);
req->val |= bus_space_read_io_2(req->port + 2) << 16;
} else
req->val = bus_space_read_io_4(req->port);
break;
default:
return (EINVAL);
}
return (0);
}
static int
iodev_pio_write(struct iodev_pio_req *req)
{
switch (req->width) {
case 1:
bus_space_write_io_1(req->port, req->val);
break;
case 2:
if (req->port & 1) {
bus_space_write_io_1(req->port, req->val);
bus_space_write_io_1(req->port + 1, req->val >> 8);
} else
bus_space_write_io_2(req->port, req->val);
break;
case 4:
if (req->port & 1) {
bus_space_write_io_1(req->port, req->val);
bus_space_write_io_2(req->port + 1, req->val >> 8);
bus_space_write_io_1(req->port + 3, req->val >> 24);
} else if (req->port & 2) {
bus_space_write_io_2(req->port, req->val);
bus_space_write_io_2(req->port + 2, req->val >> 16);
} else
bus_space_write_io_4(req->port, req->val);
break;
default:
return (EINVAL);
}
return (0);
}

63
sys/ia64/ia64/sys_machdep.c
View File

@ -49,72 +49,9 @@ struct sysarch_args {
int
sysarch(struct thread *td, struct sysarch_args *uap)
{
struct ia64_iodesc iod;
int error;
error = 0;
switch(uap->op) {
case IA64_IORD:
copyin(uap->parms, &iod, sizeof(iod));
switch (iod.width) {
case 1:
iod.val = inb(iod.port);
break;
case 2:
if (iod.port & 1) {
iod.val = inb(iod.port);
iod.val |= inb(iod.port + 1) << 8;
} else
iod.val = inw(iod.port);
break;
case 4:
if (iod.port & 3) {
if (iod.port & 1) {
iod.val = inb(iod.port);
iod.val |= inw(iod.port + 1) << 8;
iod.val |= inb(iod.port + 3) << 24;
} else {
iod.val = inw(iod.port);
iod.val |= inw(iod.port + 2) << 16;
}
} else
iod.val = inl(iod.port);
break;
default:
error = EINVAL;
}
copyout(&iod, uap->parms, sizeof(iod));
break;
case IA64_IOWR:
copyin(uap->parms, &iod, sizeof(iod));
switch (iod.width) {
case 1:
outb(iod.port, iod.val);
break;
case 2:
if (iod.port & 1) {
outb(iod.port, iod.val);
outb(iod.port + 1, iod.val >> 8);
} else
outw(iod.port, iod.val);
break;
case 4:
if (iod.port & 3) {
if (iod.port & 1) {
outb(iod.port, iod.val);
outw(iod.port + 1, iod.val >> 8);
outb(iod.port + 3, iod.val >> 24);
} else {
outw(iod.port, iod.val);
outw(iod.port + 2, iod.val >> 16);
}
} else
outl(iod.port, iod.val);
break;
default:
error = EINVAL;
}
break;
default:
error = EINVAL;
break;

51
sys/ia64/include/iodev.h Normal file
View File

@ -0,0 +1,51 @@
/*-
* Copyright (c) 2010 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef _MACHINE_IODEV_H_
#define _MACHINE_IODEV_H_
struct iodev_pio_req {
u_int access;
#define IODEV_PIO_READ 0
#define IODEV_PIO_WRITE 1
u_int port;
u_int width;
u_int val;
};
#define IODEV_PIO _IOWR('I', 0, struct iodev_pio_req)
#ifdef _KERNEL
d_open_t ioopen;
d_close_t ioclose;
d_ioctl_t ioioctl;
#endif
#endif /* _MACHINE_IODEV_H_ */

9
sys/ia64/include/sysarch.h
View File

@ -32,15 +32,6 @@
#ifndef _MACHINE_SYSARCH_H_
#define _MACHINE_SYSARCH_H_
#define IA64_IORD 0
#define IA64_IOWR 1
struct ia64_iodesc {
int port;
int width;
unsigned long val;
};
#ifndef _KERNEL
#include <sys/cdefs.h>