Deleted Added
sdiff udiff text old ( 168493 ) new ( 168500 )
full compact
ata-dma.c (168493) ata-dma.c (168500)
1/*-
2 * Copyright (c) 1998 - 2007 S�ren Schmidt <sos@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 - 2007 S�ren Schmidt <sos@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/ata/ata-dma.c 168493 2007-04-08 15:31:39Z sos $");
28__FBSDID("$FreeBSD: head/sys/dev/ata/ata-dma.c 168500 2007-04-08 19:18:51Z sos $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/ata.h>
33#include <sys/kernel.h>
34#include <sys/endian.h>
35#include <sys/malloc.h>
36#include <sys/lock.h>

--- 36 unchanged lines hidden (view full) ---

73 ch->dma->free = ata_dmafree;
74 ch->dma->setprd = ata_dmasetprd;
75 ch->dma->load = ata_dmaload;
76 ch->dma->unload = ata_dmaunload;
77 ch->dma->alignment = 2;
78 ch->dma->boundary = 128 * DEV_BSIZE;
79 ch->dma->segsize = 128 * DEV_BSIZE;
80 ch->dma->max_iosize = 128 * DEV_BSIZE;
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/ata.h>
33#include <sys/kernel.h>
34#include <sys/endian.h>
35#include <sys/malloc.h>
36#include <sys/lock.h>

--- 36 unchanged lines hidden (view full) ---

73 ch->dma->free = ata_dmafree;
74 ch->dma->setprd = ata_dmasetprd;
75 ch->dma->load = ata_dmaload;
76 ch->dma->unload = ata_dmaunload;
77 ch->dma->alignment = 2;
78 ch->dma->boundary = 128 * DEV_BSIZE;
79 ch->dma->segsize = 128 * DEV_BSIZE;
80 ch->dma->max_iosize = 128 * DEV_BSIZE;
81 ch->dma->max_address = BUS_SPACE_MAXADDR_32BIT;
81 }
82}
83
84static void
85ata_dmasetupc_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, int error)
86{
87 struct ata_dc_cb_args *cba = (struct ata_dc_cb_args *)xsc;
88
89 if (!(cba->error = error))
90 cba->maddr = segs[0].ds_addr;
91}
92
93static void
94ata_dmaalloc(device_t dev)
95{
96 struct ata_channel *ch = device_get_softc(dev);
97 struct ata_dc_cb_args ccba;
82 }
83}
84
85static void
86ata_dmasetupc_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, int error)
87{
88 struct ata_dc_cb_args *cba = (struct ata_dc_cb_args *)xsc;
89
90 if (!(cba->error = error))
91 cba->maddr = segs[0].ds_addr;
92}
93
94static void
95ata_dmaalloc(device_t dev)
96{
97 struct ata_channel *ch = device_get_softc(dev);
98 struct ata_dc_cb_args ccba;
98 int maxaddr = (ch->dma->flags & ATA_DMA_64BIT ?
99 BUS_SPACE_MAXADDR : BUS_SPACE_MAXADDR_32BIT);
100
101 if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0,
99
100 if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0,
102 maxaddr, BUS_SPACE_MAXADDR,
101 ch->dma->max_address, BUS_SPACE_MAXADDR,
103 NULL, NULL, ch->dma->max_iosize,
104 ATA_DMA_ENTRIES, ch->dma->segsize,
105 0, NULL, NULL, &ch->dma->dmatag))
106 goto error;
107
108 if (bus_dma_tag_create(ch->dma->dmatag, PAGE_SIZE, PAGE_SIZE,
102 NULL, NULL, ch->dma->max_iosize,
103 ATA_DMA_ENTRIES, ch->dma->segsize,
104 0, NULL, NULL, &ch->dma->dmatag))
105 goto error;
106
107 if (bus_dma_tag_create(ch->dma->dmatag, PAGE_SIZE, PAGE_SIZE,
109 maxaddr, BUS_SPACE_MAXADDR,
108 ch->dma->max_address, BUS_SPACE_MAXADDR,
110 NULL, NULL, MAXTABSZ, 1, MAXTABSZ,
111 0, NULL, NULL, &ch->dma->sg_tag))
112 goto error;
113
114 if (bus_dma_tag_create(ch->dma->dmatag,ch->dma->alignment,ch->dma->boundary,
109 NULL, NULL, MAXTABSZ, 1, MAXTABSZ,
110 0, NULL, NULL, &ch->dma->sg_tag))
111 goto error;
112
113 if (bus_dma_tag_create(ch->dma->dmatag,ch->dma->alignment,ch->dma->boundary,
115 maxaddr, BUS_SPACE_MAXADDR,
114 ch->dma->max_address, BUS_SPACE_MAXADDR,
116 NULL, NULL, ch->dma->max_iosize,
117 ATA_DMA_ENTRIES, ch->dma->segsize,
118 0, NULL, NULL, &ch->dma->data_tag))
119 goto error;
120
121 if (bus_dmamem_alloc(ch->dma->sg_tag, (void **)&ch->dma->sg, 0,
122 &ch->dma->sg_map))
123 goto error;

--- 4 unchanged lines hidden (view full) ---

128 goto error;
129 }
130 ch->dma->sg_bus = ccba.maddr;
131
132 if (bus_dmamap_create(ch->dma->data_tag, 0, &ch->dma->data_map))
133 goto error;
134
135 if (bus_dma_tag_create(ch->dma->dmatag, PAGE_SIZE, 64 * 1024,
115 NULL, NULL, ch->dma->max_iosize,
116 ATA_DMA_ENTRIES, ch->dma->segsize,
117 0, NULL, NULL, &ch->dma->data_tag))
118 goto error;
119
120 if (bus_dmamem_alloc(ch->dma->sg_tag, (void **)&ch->dma->sg, 0,
121 &ch->dma->sg_map))
122 goto error;

--- 4 unchanged lines hidden (view full) ---

127 goto error;
128 }
129 ch->dma->sg_bus = ccba.maddr;
130
131 if (bus_dmamap_create(ch->dma->data_tag, 0, &ch->dma->data_map))
132 goto error;
133
134 if (bus_dma_tag_create(ch->dma->dmatag, PAGE_SIZE, 64 * 1024,
136 maxaddr, BUS_SPACE_MAXADDR,
135 ch->dma->max_address, BUS_SPACE_MAXADDR,
137 NULL, NULL, MAXWSPCSZ, 1, MAXWSPCSZ,
138 0, NULL, NULL, &ch->dma->work_tag))
139 goto error;
140
141 if (bus_dmamem_alloc(ch->dma->work_tag, (void **)&ch->dma->work, 0,
142 &ch->dma->work_map))
143 goto error;
144

--- 141 unchanged lines hidden --- 		136 NULL, NULL, MAXWSPCSZ, 1, MAXWSPCSZ,
137 0, NULL, NULL, &ch->dma->work_tag))
138 goto error;
139
140 if (bus_dmamem_alloc(ch->dma->work_tag, (void **)&ch->dma->work, 0,
141 &ch->dma->work_map))
142 goto error;
143

--- 141 unchanged lines hidden ---