From 44f8f2fc051c8182e7c926512609e40d694f4dac Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Sat, 26 Apr 2008 14:13:48 +0000 Subject: [PATCH] Remove some remnant alpha hacks. Approved by: PCI-maintainers (imp, jhb) --- sys/dev/bce/if_bce.c | 2 +- sys/dev/bge/if_bge.c | 2 +- sys/dev/pci/pcivar.h | 7 ------- sys/dev/ti/if_ti.c | 13 +------------ 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 4df24e1d632..859d74fb7b8 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -502,7 +502,7 @@ bce_attach(device_t dev) /* Allocate PCI memory resources. */ rid = PCIR_BAR(0); sc->bce_res_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &rid, RF_ACTIVE | PCI_RF_DENSE); + &rid, RF_ACTIVE); if (sc->bce_res_mem == NULL) { BCE_PRINTF("%s(%d): PCI memory allocation failed\n", diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 8d31cfbe141..baa81ed614c 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -2240,7 +2240,7 @@ bge_attach(device_t dev) rid = BGE_PCI_BAR0; sc->bge_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE | PCI_RF_DENSE); + RF_ACTIVE); if (sc->bge_res == NULL) { device_printf (sc->bge_dev, "couldn't map memory\n"); diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 108c8cf1f33..7cb4c2941e5 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -210,13 +210,6 @@ struct pci_devinfo { #include "pci_if.h" -/* - * Define pci-specific resource flags for accessing memory via dense - * or bwx memory spaces. These flags are ignored on i386. - */ -#define PCI_RF_DENSE 0x10000 -#define PCI_RF_BWX 0x20000 - enum pci_device_ivars { PCI_IVAR_SUBVENDOR, PCI_IVAR_SUBDEVICE, diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index fd9d8ca62a3..a1b9c9d89b1 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -2009,18 +2009,7 @@ ti_chipinit(sc) } } -#ifdef __brokenalpha__ - /* - * From the Alteon sample driver: - * Must insure that we do not cross an 8K (bytes) boundary - * for DMA reads. Our highest limit is 1K bytes. This is a - * restriction on some ALPHA platforms with early revision - * 21174 PCI chipsets, such as the AlphaPC 164lx - */ - TI_SETBIT(sc, TI_PCI_STATE, pci_writemax|TI_PCI_READMAX_1024); -#else TI_SETBIT(sc, TI_PCI_STATE, pci_writemax); -#endif /* This sets the min dma param all the way up (0xff). */ TI_SETBIT(sc, TI_PCI_STATE, TI_PCISTATE_MINDMA); @@ -2314,7 +2303,7 @@ ti_attach(dev) rid = TI_PCI_LOMEM; sc->ti_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE|PCI_RF_DENSE); + RF_ACTIVE); if (sc->ti_res == NULL) { device_printf(dev, "couldn't map memory\n");