Move DMA mapping code from if_pgt_pci.c to pgt.c and port it as is for now.

Remove dead code chunk from if_pgt_pci.c.

For those who want to refer to the original code you can find it in
~mglocker/pgt/orig.

3 files changed, 289 insertions, 506 deletions

diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 48acc76e74f..0f5b66785b2 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -217,6 +217,10 @@ int	 pgt_media_change(struct ifnet *);
 void	 pgt_media_status(struct ifnet *, struct ifmediareq *);
 int	 pgt_new_state(struct ieee80211com *, enum ieee80211_state, int);
 int	 pgt_drain_tx_queue(struct pgt_softc *, enum pgt_queue);
+int	 pgt_dma_alloc(struct pgt_softc *);
+int	 pgt_dma_alloc_queue(struct pgt_softc *sc, enum pgt_queue pq);
+void	 pgt_dma_free(struct pgt_softc *);
+void	 pgt_dma_free_queue(struct pgt_softc *sc, enum pgt_queue pq);
 
 void
 pgt_write_memory_barrier(struct pgt_softc *sc)
@@ -278,7 +282,7 @@ pgt_reinit_rx_desc_frag(struct pgt_softc *sc, struct pgt_desc *pd)
 	pd->pd_fragp->pf_size = htole16(PFF_FRAG_SIZE);
 	pd->pd_fragp->pf_flags = htole16(0);
 	/* XXX */
-	bus_dmamap_sync(sc->sc_fragdmat, pd->pd_dmam, 0, 0, BUS_DMASYNC_POSTCPU2DMA);
+	bus_dmamap_sync(sc->sc_dmat, pd->pd_dmam, 0, 0, BUS_DMASYNC_POSTCPU2DMA);
 }
 
 int
@@ -288,9 +292,9 @@ pgt_load_tx_desc_frag(struct pgt_softc *sc, enum pgt_queue pq,
 	int error;
 
 	/* XXX */
-        //error = bus_dmamap_load(sc->sc_fragdmat, pd->pd_dmam, pd->pd_mem,
+        //error = bus_dmamap_load(sc->sc_dmat, pd->pd_dmam, pd->pd_mem,
         //    PFF_FRAG_SIZE, pgt_load_busaddr, &pd->pd_dmaaddr, 0);
-	error = bus_dmamap_load(sc->sc_fragdmat, pd->pd_dmam, pd->pd_mem,
+	error = bus_dmamap_load(sc->sc_dmat, pd->pd_dmam, pd->pd_mem,
 	    PFF_FRAG_SIZE, NULL, BUS_DMA_NOWAIT);
 	if (error) {
 		printf("%s: unable to load %s tx DMA: %d\n",
@@ -302,7 +306,7 @@ pgt_load_tx_desc_frag(struct pgt_softc *sc, enum pgt_queue pq,
 	pd->pd_fragp->pf_size = htole16(PFF_FRAG_SIZE);
 	pd->pd_fragp->pf_flags = htole16(0);
 	/* XXX */
-	bus_dmamap_sync(sc->sc_fragdmat, pd->pd_dmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, pd->pd_dmam, 0, 0,
 	    BUS_DMASYNC_POSTCPU2DMA);
 	return (0);
 }
@@ -310,7 +314,7 @@ pgt_load_tx_desc_frag(struct pgt_softc *sc, enum pgt_queue pq,
 void
 pgt_unload_tx_desc_frag(struct pgt_softc *sc, struct pgt_desc *pd)
 {
-        bus_dmamap_unload(sc->sc_fragdmat, pd->pd_dmam);
+        bus_dmamap_unload(sc->sc_dmat, pd->pd_dmam);
 	pd->pd_dmaaddr = 0;
 }
 
@@ -504,7 +508,7 @@ pgt_reset(struct pgt_softc *sc)
 	 * requests in progress.
 	 */
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTDMA2CPU | BUS_DMASYNC_PRECPU2DMA);
 	pgt_cleanup_queue(sc, PFF_QUEUE_DATA_LOW_RX,
 	    &sc->sc_cb->pcb_data_low_rx[0]);
@@ -519,7 +523,7 @@ pgt_reset(struct pgt_softc *sc)
 	pgt_cleanup_queue(sc, PFF_QUEUE_MGMT_TX,
 	    &sc->sc_cb->pcb_mgmt_tx[0]);
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTCPU2DMA | BUS_DMASYNC_PREDMA2CPU);
 	if (sc->sc_flags & SC_NEEDS_FIRMWARE) {
 		error = pgt_upload_firmware(sc);
@@ -730,6 +734,10 @@ pgt_attach(struct pgt_softc *sc)
 {
 	int error;
 
+	error = pgt_dma_alloc(sc);
+	if (error)
+		return (error);
+
 	return (0);
 
 	sc->sc_ic.ic_if.if_softc = sc;
@@ -883,7 +891,7 @@ pgt_update_intr(struct pgt_softc *sc, struct mbuf ***last_nextpkt,
 	int i, prevwasmf;
 
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTDMA2CPU | BUS_DMASYNC_PRECPU2DMA);
 	pgt_debug_events(sc, "intr");
 	/*
@@ -996,7 +1004,7 @@ pgt_update_intr(struct pgt_softc *sc, struct mbuf ***last_nextpkt,
 	 * Write out what we've finished with.
 	 */
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTCPU2DMA | BUS_DMASYNC_PREDMA2CPU);
 }
 
@@ -1289,7 +1297,7 @@ pgt_wakeup_intr(struct pgt_softc *sc)
 	shouldupdate = 0;
 	/* Check for any queues being empty before updating. */
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTDMA2CPU);
 	for (i = 0; !shouldupdate && i < PFF_QUEUE_COUNT; i++) {
 		if (pgt_queue_is_tx(i))
@@ -1319,7 +1327,7 @@ pgt_sleep_intr(struct pgt_softc *sc)
 	allowed = 1;
 	/* Check for any queues not being empty before allowing. */
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTDMA2CPU);
 	for (i = 0; allowed && i < PFF_QUEUE_COUNT; i++) {
 		if (pgt_queue_is_tx(i))
@@ -1610,7 +1618,7 @@ pgt_txdone(struct pgt_softc *sc, enum pgt_queue pq)
 	TAILQ_INSERT_TAIL(&sc->sc_freeq[pq], pd, pd_link);
 	sc->sc_freeq_count[pq]++;
 	/* XXX */
-	bus_dmamap_sync(sc->sc_fragdmat, pd->pd_dmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, pd->pd_dmam, 0, 0,
 	    BUS_DMASYNC_POSTDMA2CPU);
 	/* Management frames want completion information. */
 	if (sc->sc_debug & SC_DEBUG_QUEUES) {
@@ -1645,7 +1653,7 @@ pgt_rxdone(struct pgt_softc *sc, enum pgt_queue pq)
 	TAILQ_INSERT_TAIL(&sc->sc_dirtyq[pq], pd, pd_link);
 	sc->sc_dirtyq_count[pq]++;
 	/* XXX */
-	bus_dmamap_sync(sc->sc_fragdmat, pd->pd_dmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, pd->pd_dmam, 0, 0,
 	    BUS_DMASYNC_POSTDMA2CPU);
 	if (sc->sc_debug & SC_DEBUG_QUEUES)
 		printf("%s: queue: rx %u <- [%u]\n",
@@ -2076,18 +2084,18 @@ pgt_desc_transmit(struct pgt_softc *sc, enum pgt_queue pq, struct pgt_desc *pd,
 		printf("%s: queue: tx %u -> [%u]\n", sc->sc_dev.dv_xname,
 		    pd->pd_fragnum, pq);
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTDMA2CPU | BUS_DMASYNC_PRECPU2DMA);
 	if (morecoming)
 		pd->pd_fragp->pf_flags |= htole16(PF_FLAG_MF);
 	pd->pd_fragp->pf_size = htole16(len);
 	/* XXX */
-	bus_dmamap_sync(sc->sc_fragdmat, pd->pd_dmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, pd->pd_dmam, 0, 0,
 	    BUS_DMASYNC_POSTCPU2DMA);
 	sc->sc_cb->pcb_driver_curfrag[pq] =
 	    htole32(letoh32(sc->sc_cb->pcb_driver_curfrag[pq]) + 1);
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTCPU2DMA | BUS_DMASYNC_PREDMA2CPU);
 	if (!morecoming)
 		pgt_maybe_trigger(sc, pq);
@@ -3683,12 +3691,12 @@ pgt_drain_tx_queue(struct pgt_softc *sc, enum pgt_queue pq)
 	int wokeup = 0;
 
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTDMA2CPU | BUS_DMASYNC_PRECPU2DMA);
 	sc->sc_cb->pcb_device_curfrag[pq] =
 	    sc->sc_cb->pcb_driver_curfrag[pq];
 	/* XXX */
-	bus_dmamap_sync(sc->sc_cbdmat, sc->sc_cbdmam, 0, 0,
+	bus_dmamap_sync(sc->sc_dmat, sc->sc_cbdmam, 0, 0,
 	    BUS_DMASYNC_POSTCPU2DMA | BUS_DMASYNC_PREDMA2CPU);
 	while (!TAILQ_EMPTY(&sc->sc_dirtyq[pq])) {
 		struct pgt_desc *pd;
@@ -3710,3 +3718,257 @@ pgt_drain_tx_queue(struct pgt_softc *sc, enum pgt_queue pq)
 	}
 	return (wokeup);
 }
+
+int
+pgt_dma_alloc(struct pgt_softc *sc)
+{
+	size_t size;
+	int i, error, nsegs;
+
+	for (i = 0; i < PFF_QUEUE_COUNT; i++)
+		TAILQ_INIT(&sc->sc_freeq[i]);
+
+	/*
+	 * control block
+	 */
+	size = sizeof(struct pgt_control_block);
+
+	error = bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
+	    BUS_DMA_ALLOCNOW, &sc->sc_cbdmam);
+	if (error != 0) {
+		printf("%s: can not create DMA tag for control block\n",
+		    sc->sc_dev);
+		goto out;
+	}
+
+	error = bus_dmamem_alloc(sc->sc_dmat, size, PAGE_SIZE,
+	    0, &sc->sc_cbdmas, 1, &nsegs, BUS_DMA_NOWAIT);
+	if (error != 0) {
+		printf("%s: can not allocate DMA memory for control block\n",
+		    sc->sc_dev);
+		goto out;
+	}
+
+	error = bus_dmamem_map(sc->sc_dmat, &sc->sc_cbdmas, nsegs,
+	    size, (caddr_t *)&sc->sc_cb, BUS_DMA_NOWAIT);
+	if (error != 0) {
+		printf("%s: can not map DMA memory for control block\n",
+		    sc->sc_dev);
+		goto out;
+	}
+
+	error = bus_dmamap_load(sc->sc_dmat, sc->sc_cbdmam,
+	    sc->sc_cb, size, NULL, BUS_DMA_WAITOK);
+	if (error != 0) {
+		printf("%s: can not load DMA map for control block\n",
+		    sc->sc_dev);
+		goto out;
+	}
+
+	/*
+	 * powersave
+	 */
+	size = PFF_FRAG_SIZE * PFF_PSM_BUFFER_FRAME_COUNT;
+
+	error = bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
+	    BUS_DMA_ALLOCNOW, &sc->sc_psmdmam);
+	if (error != 0) {
+		printf("%s: can not create DMA tag for powersave\n",
+		    sc->sc_dev);
+		goto out;
+	}
+
+	error = bus_dmamem_alloc(sc->sc_dmat, size, PAGE_SIZE,
+	   0, &sc->sc_psmdmas, 1, &nsegs, BUS_DMA_NOWAIT);
+	if (error != 0) {
+		printf("%s: can not allocate DMA memory for powersave\n",
+		    sc->sc_dev);
+		goto out;
+	}
+
+	error = bus_dmamem_map(sc->sc_dmat, &sc->sc_psmdmas, nsegs,
+	    size, (caddr_t *)&sc->sc_psmbuf, BUS_DMA_NOWAIT);
+	if (error != 0) {
+		printf("%s: can not map DMA memory for powersave\n",
+		    sc->sc_dev);
+		goto out;
+	}
+
+	error = bus_dmamap_load(sc->sc_dmat, sc->sc_psmdmam,
+	    sc->sc_psmbuf, size, NULL, BUS_DMA_WAITOK);
+	if (error != 0) {
+		printf("%s: can not load DMA map for powersave\n",
+		    sc->sc_dev);
+		goto out;
+	}
+
+	/*
+	 * fragments
+	 */
+	error = pgt_dma_alloc_queue(sc, PFF_QUEUE_DATA_LOW_RX);
+	if (error != 0)
+		goto out;
+
+	error = pgt_dma_alloc_queue(sc, PFF_QUEUE_DATA_LOW_TX);
+	if (error != 0)
+		goto out;
+
+	error = pgt_dma_alloc_queue(sc, PFF_QUEUE_DATA_HIGH_RX);
+	if (error != 0)
+		goto out;
+
+	error = pgt_dma_alloc_queue(sc, PFF_QUEUE_DATA_HIGH_TX);
+	if (error != 0)
+		goto out;
+
+	error = pgt_dma_alloc_queue(sc, PFF_QUEUE_MGMT_RX);
+	if (error != 0)
+		goto out;
+
+	error = pgt_dma_alloc_queue(sc, PFF_QUEUE_MGMT_TX);
+	if (error != 0)
+		goto out;
+
+out:
+	if (error) {
+		printf("%s: error in DMA allocation\n", sc->sc_dev);
+		pgt_dma_free(sc);
+	}
+
+	return (error);
+}
+
+int
+pgt_dma_alloc_queue(struct pgt_softc *sc, enum pgt_queue pq)
+{
+	struct pgt_desc *pd;
+	struct pgt_frag *pcbqueue;
+	size_t i, qsize;
+	int error, nsegs;
+
+	switch (pq) {
+		case PFF_QUEUE_DATA_LOW_RX:
+			pcbqueue = sc->sc_cb->pcb_data_low_rx;
+			qsize = PFF_QUEUE_DATA_RX_SIZE;
+			break;
+		case PFF_QUEUE_DATA_LOW_TX:
+			pcbqueue = sc->sc_cb->pcb_data_low_tx;
+			qsize = PFF_QUEUE_DATA_TX_SIZE;
+			break;
+		case PFF_QUEUE_DATA_HIGH_RX:
+			pcbqueue = sc->sc_cb->pcb_data_high_rx;
+			qsize = PFF_QUEUE_DATA_RX_SIZE;
+			break;
+		case PFF_QUEUE_DATA_HIGH_TX:
+			pcbqueue = sc->sc_cb->pcb_data_high_tx;
+			qsize = PFF_QUEUE_DATA_TX_SIZE;
+			break;
+		case PFF_QUEUE_MGMT_RX:
+			pcbqueue = sc->sc_cb->pcb_mgmt_rx;
+			qsize = PFF_QUEUE_MGMT_SIZE;
+			break;
+		case PFF_QUEUE_MGMT_TX:
+			pcbqueue = sc->sc_cb->pcb_mgmt_tx;
+			qsize = PFF_QUEUE_MGMT_SIZE;
+			break;
+	}
+
+	for (i = 0; i < qsize; i++) {
+		pd = malloc(sizeof(*pd), M_DEVBUF, M_WAITOK);
+
+		error = bus_dmamap_create(sc->sc_dmat, PFF_FRAG_SIZE, 1,
+		    PFF_FRAG_SIZE, 0, BUS_DMA_ALLOCNOW, &pd->pd_dmam);
+		if (error != 0) {
+			printf("%s: can not create DMA tag for fragment\n",
+			    sc->sc_dev);
+			break;
+		}
+
+		error = bus_dmamem_alloc(sc->sc_dmat, PFF_FRAG_SIZE, PAGE_SIZE,
+		    0, &pd->pd_dmas, 1, &nsegs, BUS_DMA_WAITOK);
+		if (error != 0) {
+			printf("%s: error alloc frag %u on queue %u\n",
+			    sc->sc_dev, i, pq, error);
+			free(pd, M_DEVBUF);
+			break;
+		}
+
+		error = bus_dmamem_map(sc->sc_dmat, &pd->pd_dmas, nsegs,
+		    PFF_FRAG_SIZE, (caddr_t *)&pd->pd_mem, BUS_DMA_WAITOK);
+		if (error != 0) {
+			printf("%s: error map frag %u on queue %u\n",
+			    sc->sc_dev, i, pq);
+			free(pd, M_DEVBUF);
+			break;
+		}
+
+		if (pgt_queue_is_rx(pq)) {
+			error = bus_dmamap_load(sc->sc_dmat, pd->pd_dmam,
+			    pd->pd_mem, PFF_FRAG_SIZE, NULL, BUS_DMA_WAITOK);
+			if (error != 0) {
+				printf("%s: error load frag %u on queue %u\n",
+				    sc->sc_dev, i, pq);
+				bus_dmamem_free(sc->sc_dmat, &pd->pd_dmas,
+				    nsegs);
+				free(pd, M_DEVBUF);
+				break;
+			}
+		}
+		TAILQ_INSERT_TAIL(&sc->sc_freeq[pq], pd, pd_link);
+	}
+
+	return (error);
+}
+
+void
+pgt_dma_free(struct pgt_softc *sc)
+{
+	/*
+	 * fragments
+	 */
+	if (sc->sc_dmat != NULL) {
+		pgt_dma_free_queue(sc, PFF_QUEUE_DATA_LOW_RX);
+		pgt_dma_free_queue(sc, PFF_QUEUE_DATA_LOW_TX);
+		pgt_dma_free_queue(sc, PFF_QUEUE_DATA_HIGH_RX);
+		pgt_dma_free_queue(sc, PFF_QUEUE_DATA_HIGH_TX);
+		pgt_dma_free_queue(sc, PFF_QUEUE_MGMT_RX);
+		pgt_dma_free_queue(sc, PFF_QUEUE_MGMT_TX);
+	}
+
+	/*
+	 * powersave
+	 */
+	if (sc->sc_psmbuf != NULL) {
+		bus_dmamap_unload(sc->sc_dmat, sc->sc_psmdmam);
+		bus_dmamem_free(sc->sc_dmat, &sc->sc_psmdmas, 1);
+		sc->sc_psmbuf = NULL;
+		sc->sc_psmdmam = NULL;
+	}
+
+	/*
+	 * control block
+	 */
+	if (sc->sc_cb != NULL) {
+		bus_dmamap_unload(sc->sc_dmat, sc->sc_cbdmam);
+		bus_dmamem_free(sc->sc_dmat, &sc->sc_cbdmas, 1);
+		sc->sc_cb = NULL;
+		sc->sc_cbdmam = NULL;
+	}
+}
+
+void
+pgt_dma_free_queue(struct pgt_softc *sc, enum pgt_queue pq)
+{
+	struct pgt_desc	*pd;
+
+	while (!TAILQ_EMPTY(&sc->sc_freeq[pq])) {
+		pd = TAILQ_FIRST(&sc->sc_freeq[pq]);
+		TAILQ_REMOVE(&sc->sc_freeq[pq], pd, pd_link);
+		if (pd->pd_dmam != NULL) {
+			bus_dmamap_unload(sc->sc_dmat, pd->pd_dmam);
+			pd->pd_dmam = NULL;
+		}
+		bus_dmamem_free(sc->sc_dmat, &pd->pd_dmas, 1);
+		free(pd, M_DEVBUF);
+	}
+}
diff --git a/sys/dev/ic/pgtvar.h b/sys/dev/ic/pgtvar.h
index 7b64c696b56..1041a0f58cf 100644
--- a/sys/dev/ic/pgtvar.h
+++ b/sys/dev/ic/pgtvar.h
@@ -34,6 +34,7 @@ struct pgt_desc {
 	void		       *pd_mem;
 	bus_addr_t		pd_dmaaddr;
 	bus_dmamap_t		pd_dmam;
+	bus_dma_segment_t	pd_dmas;
 	struct pgt_frag	       *pd_fragp;
 	unsigned int		pd_fragnum;
 };
@@ -143,15 +144,18 @@ struct pgt_softc {
 	struct resource	       *sc_iores;	/* IO memory resource */
 	bus_space_tag_t		sc_iotag;
 	bus_space_handle_t	sc_iohandle; 
-	bus_dma_tag_t		sc_cbdmat;	/* control block DMA */
+	bus_dma_tag_t		sc_dmat;
+	//bus_dma_tag_t		sc_cbdmat;	/* control block DMA */
 	bus_dmamap_t		sc_cbdmam;
+	bus_dma_segment_t	sc_cbdmas;
 	bus_addr_t		sc_cbdmabusaddr;
 	struct pgt_control_block *sc_cb;	/* DMA-mapped control block */
-	bus_dma_tag_t		sc_psmdmat;	/* power save buffer DMA */
+	//bus_dma_tag_t		sc_psmdmat;	/* power save buffer DMA */
 	bus_dmamap_t		sc_psmdmam;
+	bus_dma_segment_t	sc_psmdmas;
 	bus_addr_t		sc_psmdmabusaddr;
 	void		       *sc_psmbuf;	/* DMA-mapped psm frame area */
-	bus_dma_tag_t		sc_fragdmat;	/* tags for all queues */
+	//bus_dma_tag_t		sc_fragdmat;	/* tags for all queues */
 	struct pgt_mgmt_descq	sc_mgmtinprog;
 	struct pgt_descq	sc_freeq[PFF_QUEUE_COUNT];
 	size_t			sc_freeq_count[PFF_QUEUE_COUNT];
diff --git a/sys/dev/pci/if_pgt_pci.c b/sys/dev/pci/if_pgt_pci.c
index d417ccd650e..848b6c8b8ca 100644
--- a/sys/dev/pci/if_pgt_pci.c
+++ b/sys/dev/pci/if_pgt_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pgt_pci.c,v 1.2 2006/08/24 23:55:35 mglocker Exp $  */
+/*	$OpenBSD: if_pgt_pci.c,v 1.3 2006/08/28 10:23:49 mglocker Exp $  */
 
 /*
  * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org>
@@ -98,7 +98,7 @@ pgt_pci_attach(struct device *parent, struct device *self, void *aux)
 	pci_intr_handle_t ih;
 	int error;
 
-	sc->sc_cbdmat = pa->pa_dmat;
+	sc->sc_dmat = pa->pa_dmat;
 	psc->sc_pc = pa->pa_pc;
 
 	/* map control / status registers */
@@ -144,486 +144,3 @@ pgt_pci_detach(struct device *self, int flags)
 
 	return (0);
 }
-
-#if 0
-/*-
- * Copyright (c) 2004 Fujitsu Laboratories of America, Inc.
- * Copyright (c) 2004 Brian Fundakowski Feldman
- * 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.
- *
- * $Id: if_pgt_pci.c,v 1.2 2006/08/24 23:55:35 mglocker Exp $
- */
-
-#include <sys/cdefs.h>
-#include "bpfilter.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-
-#include <machine/bus.h>
-#include <machine/endian.h>
-#include <machine/intr.h>
-
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
-
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip.h>
-#endif
-
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_radiotap.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
-
-#include <dev/ic/if_pffreg.h>
-#include <dev/ic/if_pffvar.h>
-
-int     pgt_pci_match(struct device *, void *, void *);
-void    pgt_pci_attach(struct device *, struct device *, void *);
-int     pgt_pci_detach(struct device *, int);
-
-struct cfattach pgt_pci_ca = {
-        sizeof (struct pgt_softc), pgt_pci_match, pgt_pci_attach,
-        pgt_pci_detach
-};
-
-static const struct pgt_ident {
-	enum pgt_dev_type	dev_type;
-	uint16_t		vendor;
-	uint16_t		device;
-	uint16_t		subvendor;
-	uint16_t		subdevice;
-} pgt_ident_table[] = {
-	{	/* 3COM 3CRWE154G72 Wireless LAN adapter */
-	  PFF_DEV_3COM6001,
-	  PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CRWE154G72,
-	  PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CRWE154G72
-	},
-	{	/* D-Link Air Plus Xtreme G A1 - DWL-g650 A1" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_DLINK, 0x3202
-	},
-	{	/* I-O Data WN-G54/CB - WN-G54/CB" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_IODATA, 0xd019
-	},
-	{	/* NETGEAR WG511" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_NETGEAR, 0x4800
-	},
-	{	/* PLANEX GW-DS54G" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_I4, 0x0020
-	},
-	{	/* EZ Connect g 2.4GHz 54 Mbps Wireless PCI Card - SMC2802W" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_SMC, 0x2802
-	},
-	{	/* EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Adapter - SMC2835W" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_SMC, 0x2835
-	},
-	{	/* I4 Z-Com XG-600" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_I4, 0x0014
-	},
-	{	/* I4 Z-Com XG-900/PLANEX GW-DS54G" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_I4, 0x0020
-	},
-	{	/* SMC 2802Wv2" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_ACCTON, 0xee03
-	},
-	{	/* SMC 2835Wv2" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  PCI_VENDOR_SMC, 0xa835
-	},
-	{	/* Intersil PRISM Indigo Wireless LAN adapter" */
-	  PFF_DEV_ISL3877,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3877,
-	  0, 0
-	},
-	{	/* Intersil PRISM Duette/Prism GT Wireless LAN adapter" */
-	  PFF_DEV_ISL3890,
-	  PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_ISL3890,
-	  0, 0
-	},
-	{ 0, 0, 0, 0, 0 }
-};
-
-static const struct pgt_ident *
-pgt_match(struct pci_attach_args *pa)
-{
-	u_int32_t subsysid;
-	int i;
-
-	subsysid = pci_conf_read(pa->pa_pc, pa->pa_tag,
-	    PCI_SUBSYS_ID_REG);
-	for (i = 0; pgt_ident_table[i].dev_type; i++) {
-		if (PCI_VENDOR(pa->pa_id) == pgt_ident_table[i].vendor &&
-		    PCI_PRODUCT(pa->pa_id) == pgt_ident_table[i].device &&
-		    (pgt_ident_table[i].subvendor == 0x0000 ||
-		    PCI_VENDOR(subsysid) == pgt_ident_table[i].subvendor) &&
-		    (pgt_ident_table[i].subdevice == 0x0000 ||
-		    PCI_PRODUCT(subsysid) == pgt_ident_table[i].subdevice))
-			return &pgt_ident_table[i];
-	}
-	return (NULL);
-}
-
-int
-pgt_pci_match(struct device *parent, void *match, void *aux)
-{
-	struct pci_attach_args *pa = aux;
-	const struct pgt_ident *id;
-
-	id = pgt_match(pa);
-	if (id == NULL)
-		return (0);
-	return (1);
-}
-
-void
-pgt_load_busaddr(void *arg, bus_dma_segment_t *segs, int nseg, int error)
-{
-	if (error == 0)
-		*(bus_addr_t *)arg = segs->ds_addr;
-}
-
-void
-pgt_pci_attach(struct device *parent, struct device *self, void *aux)
-{
-	struct pci_attach_args *pa = aux;
-	const struct pgt_ident *id;
-	struct pgt_softc *sc = (void *)self;
-	void *vaddr;
-	size_t size;
-	int error, i, rid;
-
-	id = pgt_match(pa);
-	sc->sc_dev_type = id->dev_type;
-	for (i = 0; i < PFF_QUEUE_COUNT; i++) {
-		TAILQ_INIT(&sc->sc_freeq[i]);
-		TAILQ_INIT(&sc->sc_dirtyq[i]);
-	}
-	pci_enable_busmaster(dev);
-	rid = 0;
-	sc->sc_intres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
-	    RF_ACTIVE | RF_SHAREABLE);
-	if (sc->sc_intres == NULL) {
-		printf("%s: cannot allocate IRQ", sc->sc_dev.dv_xname);
-		error = ENXIO;
-		goto out;
-	}
-	rid = PCIR_BAR(0);
-	sc->sc_iores = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
-	    RF_ACTIVE);
-	if (sc->sc_iores == NULL) {
-		printf("%s: cannot map IO\n", sc->sc_dev.dv_xname);
-		error = ENXIO;
-		goto out;
-	}
-	sc->sc_iotag = rman_get_bustag(sc->sc_iores);
-	sc->sc_iohandle = rman_get_bushandle(sc->sc_iores);
-	if (rman_get_size(sc->sc_iores) < PFF_DIRECT_MEMORY_OFFSET +
-	    PFF_DIRECT_MEMORY_SIZE) {
-		printf("%s: IO range too small (%lu)\n",
-		    sc->sc_dev.dv_xname,
-		    rman_get_size(sc->sc_iores));
-		error = ENXIO;
-		goto out;
-	}
-	size = sizeof(struct pgt_control_block);
-	error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT,
-	    BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size,
-	    BUS_DMA_ALLOCNOW, NULL, NULL, &sc->sc_cbdmat);
-	if (error != 0) {
-		printf("%s: could not set up control block tag: %d\n",
-		    sc->sc_dev.dv_xname, error);
-		goto out;
-	}
-	error = bus_dmamem_alloc(sc->sc_cbdmat, &vaddr,
-	    BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->sc_cbdmam);
-	if (error) {
-		printf("%s: could not set up control block map: %d\n",
-		    sc->sc_dev.dv_xname, error);
-		goto out;
-	}
-	sc->sc_cb = vaddr;
-	error = bus_dmamap_load(sc->sc_cbdmat, sc->sc_cbdmam, sc->sc_cb,
-	    size, pgt_load_busaddr, &sc->sc_cbdmabusaddr, 0);
-	if (error) {
-		printf("%s: could not load control block: %d\n",
-		    sc->sc_dev.dv_xname, error);
-		goto out;
-	}
-	/*
-	 * Allocate the power-saving mode frame buffering area.
-	 */
-	size = PFF_FRAG_SIZE * PFF_PSM_BUFFER_FRAME_COUNT;
-	error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT,
-	    BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size,
-	    BUS_DMA_ALLOCNOW, NULL, NULL, &sc->sc_psmdmat);
-	if (error != 0) {
-		printf("%s: could not set up psm tag: %d\n",
-		    sc->sc_dev.dv_xname, error);
-		goto out;
-	}
-	error = bus_dmamem_alloc(sc->sc_psmdmat, &vaddr,
-	    BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->sc_psmdmam);
-	if (error) {
-		printf("%s: could not set up psm buffer: %d\n",
-		    sc->sc_dev.dv_xname, error);
-		goto out;
-	}
-	sc->sc_psmbuf = vaddr;
-	error = bus_dmamap_load(sc->sc_psmdmat, sc->sc_psmdmam, sc->sc_psmbuf,
-	    size, pgt_load_busaddr, &sc->sc_psmdmabusaddr, 0);
-	if (error) {
-		printf("%s: could not load psm buffer: %d\n",
-		    sc->sc_dev.dv_xname, error);
-		goto out;
-	}
-	/*
-	 * Allocate an mbuf-cluster-sized DMA tag for every pgt_frag in
-	 * the pgt_control_block (mirrored in the pgt_descqs).
-	 */
-	i = PFF_QUEUE_DATA_RX_SIZE + PFF_QUEUE_DATA_TX_SIZE +
-	    PFF_QUEUE_DATA_RX_SIZE + PFF_QUEUE_DATA_TX_SIZE +
-	    PFF_QUEUE_MGMT_SIZE + PFF_QUEUE_MGMT_SIZE;
-	error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT,
-	    BUS_SPACE_MAXADDR, NULL, NULL, PFF_FRAG_SIZE, i, PFF_FRAG_SIZE,
-	    BUS_DMA_ALLOCNOW, NULL, NULL, &sc->sc_fragdmat);
-	if (error != 0) {
-		printf("%s: could not set up fragment tags: %d\n",
-		    sc->sc_dev.dv_xname, error);
-		goto out;
-	}
-	error = pgt_pci_attach_queue(sc, PFF_QUEUE_DATA_LOW_RX);
-	if (error == 0)
-		error = pgt_pci_attach_queue(sc, PFF_QUEUE_DATA_LOW_TX);
-	if (error == 0)
-		error = pgt_pci_attach_queue(sc, PFF_QUEUE_DATA_HIGH_RX);
-	if (error == 0)
-		error = pgt_pci_attach_queue(sc, PFF_QUEUE_DATA_HIGH_TX);
-	if (error == 0)
-		error = pgt_pci_attach_queue(sc, PFF_QUEUE_MGMT_RX);
-	if (error == 0)
-		error = pgt_pci_attach_queue(sc, PFF_QUEUE_MGMT_TX);
-	if (error != 0)
-		goto out;
-	error = pgt_attach(dev);
-out:
-	if (error)
-		pgt_pci_release(dev, sc);
-	return (error);
-}
-
-static void
-pgt_pci_release(device_t dev, struct pgt_softc *sc)
-{
-	if (sc->sc_fragdmat != NULL) {
-		pgt_pci_detach_queue(sc, PFF_QUEUE_DATA_LOW_RX);
-		pgt_pci_detach_queue(sc, PFF_QUEUE_DATA_LOW_TX);
-		pgt_pci_detach_queue(sc, PFF_QUEUE_DATA_HIGH_RX);
-		pgt_pci_detach_queue(sc, PFF_QUEUE_DATA_HIGH_TX);
-		pgt_pci_detach_queue(sc, PFF_QUEUE_MGMT_RX);
-		pgt_pci_detach_queue(sc, PFF_QUEUE_MGMT_TX);
-		bus_dma_tag_destroy(sc->sc_fragdmat);
-		sc->sc_fragdmat = NULL;
-	}
-	if (sc->sc_psmdmabusaddr != 0) {
-		bus_dmamap_unload(sc->sc_psmdmat, sc->sc_psmdmam);
-		sc->sc_psmdmabusaddr = 0;
-	}
-	if (sc->sc_psmbuf != NULL) {
-		bus_dmamem_free(sc->sc_psmdmat, sc->sc_psmbuf, sc->sc_psmdmam);
-		sc->sc_psmbuf = NULL;
-		sc->sc_psmdmam = NULL;
-	}
-	if (sc->sc_psmdmat != NULL) {
-		bus_dma_tag_destroy(sc->sc_psmdmat);
-		sc->sc_psmdmat = NULL;
-	}
-	if (sc->sc_cbdmabusaddr != 0) {
-		bus_dmamap_unload(sc->sc_psmdmat, sc->sc_psmdmam);
-		sc->sc_cbdmabusaddr = 0;
-	}
-	if (sc->sc_cb != NULL) {
-		bus_dmamem_free(sc->sc_cbdmat, sc->sc_cb, sc->sc_cbdmam);
-		sc->sc_cb = NULL;
-		sc->sc_cbdmam = NULL;
-	}
-	if (sc->sc_cbdmat != NULL) {
-		bus_dma_tag_destroy(sc->sc_cbdmat);
-		sc->sc_cbdmat = NULL;
-	}
-	if (sc->sc_iores != NULL) {
-		bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(0),
-		    sc->sc_iores);
-		sc->sc_iores = NULL;
-	}
-	if (sc->sc_intres != NULL) {
-		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_intres);
-		sc->sc_intres = NULL;
-	}
-}
-
-static int
-pgt_pci_detach(device_t dev)
-{
-	int error;
-
-	error = pgt_detach(dev);
-	if (error)
-		return (error);
-	pgt_pci_release(dev, device_get_softc(dev));
-	return (error);
-}
-
-static int
-pgt_pci_shutdown(device_t dev)
-{
-	struct pgt_softc *sc;
-
-	sc = device_get_softc(dev);
-	pgt_reboot(sc);
-	return (0);
-}
-
-static int
-pgt_pci_attach_queue(struct pgt_softc *sc, enum pgt_queue pq)
-{
-	struct pgt_desc *pd;
-	struct pgt_frag *pcbqueue;
-	size_t i, qsize;
-	int error;
-
-	switch (pq) {
-	case PFF_QUEUE_DATA_LOW_RX:
-		pcbqueue = sc->sc_cb->pcb_data_low_rx;
-		qsize = PFF_QUEUE_DATA_RX_SIZE;
-		break;
-	case PFF_QUEUE_DATA_LOW_TX:
-		pcbqueue = sc->sc_cb->pcb_data_low_tx;
-		qsize = PFF_QUEUE_DATA_TX_SIZE;
-		break;
-	case PFF_QUEUE_DATA_HIGH_RX:
-		pcbqueue = sc->sc_cb->pcb_data_high_rx;
-		qsize = PFF_QUEUE_DATA_RX_SIZE;
-		break;
-	case PFF_QUEUE_DATA_HIGH_TX:
-		pcbqueue = sc->sc_cb->pcb_data_high_tx;
-		qsize = PFF_QUEUE_DATA_TX_SIZE;
-		break;
-	case PFF_QUEUE_MGMT_RX:
-		pcbqueue = sc->sc_cb->pcb_mgmt_rx;
-		qsize = PFF_QUEUE_MGMT_SIZE;
-		break;
-	case PFF_QUEUE_MGMT_TX:
-		pcbqueue = sc->sc_cb->pcb_mgmt_tx;
-		qsize = PFF_QUEUE_MGMT_SIZE;
-		break;
-	}
-	for (i = 0; i < qsize; i++) {
-		pd = malloc(sizeof(*pd), M_PFF, M_WAITOK);
-		bzero(pd, sizeof *pd);
-		error = bus_dmamem_alloc(sc->sc_fragdmat,
-		    &pd->pd_mem, BUS_DMA_WAITOK | BUS_DMA_ZERO,
-		    &pd->pd_dmam);
-		if (error) {
-			printf("%s: error allocating fragment "
-			    "%u on queue %u: %d\n",
-			    sc->sc_dev.dv_xname, i, pq, error);
-			free(pd, M_PFF);
-			break;
-		}
-		if (pgt_queue_is_rx(pq)) {
-			error = bus_dmamap_load(sc->sc_fragdmat, pd->pd_dmam,
-			    pd->pd_mem, PFF_FRAG_SIZE, pgt_load_busaddr,
-			    &pd->pd_dmaaddr, 0);
-			if (error) {
-				printf("%s: error loading "
-				    "fragment %u on queue %u: %d\n",
-				    sc->sc_dev.dv_xname, i, pq, error);
-				bus_dmamem_free(sc->sc_fragdmat, pd->pd_mem,
-				    pd->pd_dmam);
-				free(pd, M_PFF);
-				break;
-			}
-		}
-		TAILQ_INSERT_TAIL(&sc->sc_freeq[pq], pd, pd_link);
-	}
-	return (error);
-}
-
-static void
-pgt_pci_detach_queue(struct pgt_softc *sc, enum pgt_queue pq)
-{
-	struct pgt_desc *pd;
-	while (!TAILQ_EMPTY(&sc->sc_freeq[pq])) {
-		pd = TAILQ_FIRST(&sc->sc_freeq[pq]);
-		TAILQ_REMOVE_HEAD(&sc->sc_freeq[pq], pd_link);
-		if (pd->pd_dmaaddr != 0) {
-			bus_dmamap_unload(sc->sc_fragdmat, pd->pd_dmam);
-			pd->pd_dmaaddr = 0;
-		}
-		bus_dmamem_free(sc->sc_fragdmat, pd->pd_mem, pd->pd_dmam);
-		free(pd, M_PFF);
-	}
-}
-#endif