Remove XRPU driver, after asking all the users.

5 files changed, 0 insertions, 310 deletions

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 68f88b6..69ba3db 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -432,8 +432,6 @@ hint.pbio.0.at="isa"
 hint.pbio.0.port="0x360"
 device		smbios
 device		vpd
-# HOT1 Xilinx 6200 card (http://www.vcc.com/)
-device		xrpu
 
 #
 # Laptop/Notebook options:
diff --git a/sys/conf/files b/sys/conf/files
index 86cef34..ff4d8f2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2021,7 +2021,6 @@ pci/intpm.c			optional intpm pci
 pci/ncr.c			optional ncr pci
 pci/nfsmb.c			optional nfsmb pci
 pci/viapm.c			optional viapm pci
-pci/xrpu.c			optional xrpu pci
 rpc/rpcclnt.c			optional nfsclient
 security/audit/audit.c		optional audit
 security/audit/audit_arg.c	optional audit
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index eac6c55..3c1e7c2 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -823,8 +823,6 @@ hint.pbio.0.port="0x360"
 device		spic
 hint.spic.0.at="isa"
 hint.spic.0.port="0x10a0"
-# HOT1 Xilinx 6200 card (http://www.vcc.com/)
-device		xrpu
 
 #
 # Laptop/Notebook options:
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
deleted file mode 100644
index 0ca567f..0000000
--- a/sys/pci/xrpu.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- */
-
-/*
- * A very simple device driver for PCI cards based on Xilinx 6200 series
- * FPGA/RPU devices.  Current Functionality is to allow you to open and
- * mmap the entire thing into your program.
- *
- * Hardware currently supported:
- *	www.vcc.com HotWorks 1 6216 based card.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/timetc.h>
-#include <sys/timepps.h>
-#include <sys/xrpuio.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <sys/rman.h>
-#include <machine/resource.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include "pci_if.h"
-
-/*
- * Device driver initialization stuff
- */
-
-static d_open_t	xrpu_open;
-static d_close_t xrpu_close;
-static d_ioctl_t xrpu_ioctl;
-static d_mmap_t xrpu_mmap;
-
-static struct cdevsw xrpu_cdevsw = {
-	.d_version =	D_VERSION,
-	.d_flags =	D_NEEDGIANT,
-	.d_open =	xrpu_open,
-	.d_close =	xrpu_close,
-	.d_ioctl =	xrpu_ioctl,
-	.d_mmap =	xrpu_mmap,
-	.d_name =	"xrpu",
-};
-
-static MALLOC_DEFINE(M_XRPU, "xrpu", "XRPU related");
-
-static devclass_t xrpu_devclass;
-
-#define dev2unit(devt) (minor(devt) & 0xff)
-#define dev2pps(devt) ((minor(devt) >> 16)-1)
-
-struct softc {
-	enum { NORMAL, TIMECOUNTER } mode;
-	vm_offset_t virbase, physbase;
-	u_int	*virbase62;
-	struct timecounter tc;
-	u_int *trigger, *latch, dummy;
-	struct pps_state pps[XRPU_MAX_PPS];
-	u_int *assert[XRPU_MAX_PPS], *clear[XRPU_MAX_PPS];
-};
-
-static unsigned         
-xrpu_get_timecount(struct timecounter *tc)
-{               
-	struct softc *sc = tc->tc_priv;
-
-	sc->dummy += *sc->trigger;
-	return (*sc->latch & tc->tc_counter_mask);
-}        
-
-static void            
-xrpu_poll_pps(struct timecounter *tc)
-{               
-        struct softc *sc = tc->tc_priv;
-	int i, j;
-        unsigned count1, ppscount; 
-                
-	for (i = 0; i < XRPU_MAX_PPS; i++) {
-		if (sc->assert[i]) {
-			pps_capture(&sc->pps[i]);
-			ppscount = *(sc->assert[i]) & tc->tc_counter_mask;
-			j = 0;
-			do {
-				count1 = ppscount;
-				ppscount =  *(sc->assert[i]) & tc->tc_counter_mask;
-			} while (ppscount != count1 && ++j < 5);
-			sc->pps[i].capcount = ppscount;
-			pps_event(&sc->pps[i], PPS_CAPTUREASSERT);
-		}
-		if (sc->clear[i]) {
-			pps_capture(&sc->pps[i]);
-			j = 0;
-			ppscount = *(sc->clear[i]) & tc->tc_counter_mask;
-			do {
-				count1 = ppscount;
-				ppscount =  *(sc->clear[i]) & tc->tc_counter_mask;
-			} while (ppscount != count1 && ++j < 5);
-			sc->pps[i].capcount = ppscount;
-			pps_event(&sc->pps[i], PPS_CAPTURECLEAR);
-		}
-	}
-}
-
-static int
-xrpu_open(struct cdev *dev, int flag, int mode, struct  thread *td)
-{
-	struct softc *sc = devclass_get_softc(xrpu_devclass, dev2unit(dev));
-
-	if (!sc)
-		return (ENXIO);
-	dev->si_drv1 = sc;
-	return (0);
-}
-
-static int
-xrpu_close(struct cdev *dev, int flag, int mode, struct  thread *td)
-{ 
-	return (0);
-}
-
-static int
-xrpu_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
-{
-	struct softc *sc = dev->si_drv1;
-	if (offset >= 0x1000000) 
-		return (-1);
-	*paddr = sc->physbase + offset;
-	return (0);
-}
-
-static int
-xrpu_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, struct  thread *tdr)
-{
-	struct softc *sc = dev->si_drv1;
-	int i, error;
-
-	if (sc->mode == TIMECOUNTER) {
-		i = dev2pps(dev);
-		if (i < 0 || i >= XRPU_MAX_PPS)
-			return ENODEV;
-		error =  pps_ioctl(cmd, arg, &sc->pps[i]);
-		return (error);
-	}
-		
-	if (cmd == XRPU_IOC_TIMECOUNTING) {
-		struct xrpu_timecounting *xt = (struct xrpu_timecounting *)arg;
-
-		/* Name SHALL be zero terminated */
-		xt->xt_name[sizeof xt->xt_name - 1] = '\0';
-		i = strlen(xt->xt_name);
-		sc->tc.tc_name = (char *)malloc(i + 1, M_XRPU, M_WAITOK);
-		strcpy(sc->tc.tc_name, xt->xt_name);
-		sc->tc.tc_frequency = xt->xt_frequency;
-		sc->tc.tc_get_timecount = xrpu_get_timecount;
-		sc->tc.tc_poll_pps = xrpu_poll_pps;
-		sc->tc.tc_priv = sc;
-		sc->tc.tc_counter_mask = xt->xt_mask;
-		sc->trigger = sc->virbase62 + xt->xt_addr_trigger;
-		sc->latch = sc->virbase62 + xt->xt_addr_latch;
-
-		for (i = 0; i < XRPU_MAX_PPS; i++) {
-			if (xt->xt_pps[i].xt_addr_assert == 0
-			    && xt->xt_pps[i].xt_addr_clear == 0)
-				continue;
-			make_dev(&xrpu_cdevsw, (i+1)<<16, 
-			    UID_ROOT, GID_WHEEL, 0600, "xpps%d", i);
-			sc->pps[i].ppscap = 0;
-			if (xt->xt_pps[i].xt_addr_assert) {
-				sc->assert[i] = sc->virbase62 + xt->xt_pps[i].xt_addr_assert;
-				sc->pps[i].ppscap |= PPS_CAPTUREASSERT;
-			}
-			if (xt->xt_pps[i].xt_addr_clear) {
-				sc->clear[i] = sc->virbase62 + xt->xt_pps[i].xt_addr_clear;
-				sc->pps[i].ppscap |= PPS_CAPTURECLEAR;
-			}
-			pps_init(&sc->pps[i]);
-		}
-		sc->mode = TIMECOUNTER;
-		tc_init(&sc->tc);
-		return (0);
-	}
-	error = ENOTTY;
-	return (error);
-}
-
-/*
- * PCI initialization stuff
- */
-
-static int
-xrpu_probe(device_t self)
-{
-	char *desc;
-
-	desc = NULL;
-	switch (pci_get_devid(self)) {
-	case 0x6216133e:
-		desc = "VCC Hotworks-I xc6216";
-		break;
-	}
-	if (desc == NULL)
-		return ENXIO;
-
-	device_set_desc(self, desc);
-	return (BUS_PROBE_DEFAULT);
-}
-
-static int
-xrpu_attach(device_t self)
-{
-	struct softc *sc;
-	struct resource *res;
-	int rid, unit;
-
-	unit = device_get_unit(self);
-	sc = device_get_softc(self);
-	sc->mode = NORMAL;
-	rid = PCIR_BAR(0);
-	res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
-	if (res == NULL) {
-		device_printf(self, "Could not map memory\n");
-		return ENXIO;
-	}
-	sc->virbase = (vm_offset_t)rman_get_virtual(res);
-	sc->physbase = rman_get_start(res);
-	sc->virbase62 = (u_int *)(sc->virbase + 0x800000);
-
-	if (bootverbose)
-		printf("Mapped physbase %#lx to virbase %#lx\n",
-		    (u_long)sc->physbase, (u_long)sc->virbase);
-
-	make_dev(&xrpu_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "xrpu%d", unit);
-	return 0;
-}
-
-static device_method_t xrpu_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		xrpu_probe),
-	DEVMETHOD(device_attach,	xrpu_attach),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-
-	{0, 0}
-};
- 
-static driver_t xrpu_driver = {
-	"xrpu",
-	xrpu_methods,
-	sizeof(struct softc)
-};
- 
- 
-DRIVER_MODULE(xrpu, pci, xrpu_driver, xrpu_devclass, 0, 0);
-MODULE_DEPEND(xrpu, pci, 1, 1, 1);
diff --git a/sys/sys/xrpuio.h b/sys/sys/xrpuio.h
deleted file mode 100644
index 94bd38d..0000000
--- a/sys/sys/xrpuio.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD$
- *
- */
-
-#ifndef _SYS_XRPUIO_H_
-#define _SYS_XRPUIO_H_
-
-#include <sys/ioccom.h>
-
-#define XRPU_MAX_PPS	16
-struct xrpu_timecounting {
-
-	/* The timecounter itself */
-	u_int		xt_addr_trigger;
-	u_int		xt_addr_latch;
-	unsigned	xt_mask;
-	u_int32_t	xt_frequency;
-	char		xt_name[16];
-
-	/* The PPS latches */
-	struct {
-		u_int	xt_addr_assert;
-		u_int	xt_addr_clear;
-	} xt_pps[XRPU_MAX_PPS];
-};
-
-#define XRPU_IOC_TIMECOUNTING _IOW('6', 1, struct xrpu_timecounting)
-
-#endif /* _SYS_XRPUIO_H_ */