Deleted Added
sdiff udiff text old ( 170872 ) new ( 241591 )
full compact
aic_cbus.c (170872) aic_cbus.c (241591)
1/*-
2 * Copyright (c) 1999 Luoqi Chen.
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 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1999 Luoqi Chen.
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 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/aic/aic_cbus.c 170872 2007-06-17 05:55:54Z scottl $");
28__FBSDID("$FreeBSD: head/sys/dev/aic/aic_cbus.c 241591 2012-10-15 16:09:59Z jhb $");
29
30#include <sys/param.h>
29
30#include <sys/param.h>
31#include <sys/callout.h>
31#include <sys/kernel.h>
32#include <sys/kernel.h>
33#include <sys/lock.h>
32#include <sys/module.h>
34#include <sys/module.h>
35#include <sys/mutex.h>
33#include <sys/bus.h>
34
35#include <machine/bus.h>
36#include <machine/resource.h>
37#include <sys/rman.h>
38
39#include <isa/isavar.h>
40#include <dev/aic/aic6360reg.h>

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

87 bus_addr_t *bs_iat;
88
89 if ((isa_get_logicalid(dev) == 0xa180a3b8) ||
90 (AIC_TYPE98(device_get_flags(dev)) == AIC98_NEC100))
91 bs_iat = aicport_100;
92 else
93 bs_iat = aicport_generic;
94
36#include <sys/bus.h>
37
38#include <machine/bus.h>
39#include <machine/resource.h>
40#include <sys/rman.h>
41
42#include <isa/isavar.h>
43#include <dev/aic/aic6360reg.h>

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

90 bus_addr_t *bs_iat;
91
92 if ((isa_get_logicalid(dev) == 0xa180a3b8) ||
93 (AIC_TYPE98(device_get_flags(dev)) == AIC98_NEC100))
94 bs_iat = aicport_100;
95 else
96 bs_iat = aicport_generic;
97
95 sc->sc_port = sc->sc_irq = sc->sc_drq = 0;
98 sc->sc_port = sc->sc_irq = sc->sc_drq = NULL;
96
97 rid = 0;
98 sc->sc_port = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid,
99 bs_iat, AIC_ISA_PORTSIZE, RF_ACTIVE);
100 if (!sc->sc_port) {
101 device_printf(dev, "I/O port allocation failed\n");
102 return (ENOMEM);
103 }
104 isa_load_resourcev(sc->sc_port, bs_iat, AIC_ISA_PORTSIZE);
99
100 rid = 0;
101 sc->sc_port = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid,
102 bs_iat, AIC_ISA_PORTSIZE, RF_ACTIVE);
103 if (!sc->sc_port) {
104 device_printf(dev, "I/O port allocation failed\n");
105 return (ENOMEM);
106 }
107 isa_load_resourcev(sc->sc_port, bs_iat, AIC_ISA_PORTSIZE);
108 mtx_init(&sc->sc_aic.lock, "aic", NULL, MTX_DEF);
105
106 if (isa_get_irq(dev) != -1) {
107 rid = 0;
108 sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
109 RF_ACTIVE);
110 if (!sc->sc_irq) {
111 device_printf(dev, "IRQ allocation failed\n");
112 aic_isa_release_resources(dev);

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

121 if (!sc->sc_drq) {
122 device_printf(dev, "DRQ allocation failed\n");
123 aic_isa_release_resources(dev);
124 return (ENOMEM);
125 }
126 }
127
128 sc->sc_aic.dev = dev;
109
110 if (isa_get_irq(dev) != -1) {
111 rid = 0;
112 sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
113 RF_ACTIVE);
114 if (!sc->sc_irq) {
115 device_printf(dev, "IRQ allocation failed\n");
116 aic_isa_release_resources(dev);

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

125 if (!sc->sc_drq) {
126 device_printf(dev, "DRQ allocation failed\n");
127 aic_isa_release_resources(dev);
128 return (ENOMEM);
129 }
130 }
131
132 sc->sc_aic.dev = dev;
129 sc->sc_aic.unit = device_get_unit(dev);
130 sc->sc_aic.tag = rman_get_bustag(sc->sc_port);
131 sc->sc_aic.bsh = rman_get_bushandle(sc->sc_port);
133 sc->sc_aic.res = sc->sc_port;
132 return (0);
133}
134
135static void
136aic_isa_release_resources(device_t dev)
137{
138 struct aic_isa_softc *sc = device_get_softc(dev);
139
140 if (sc->sc_port)
141 bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->sc_port);
142 if (sc->sc_irq)
143 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq);
144 if (sc->sc_drq)
145 bus_release_resource(dev, SYS_RES_DRQ, 0, sc->sc_drq);
134 return (0);
135}
136
137static void
138aic_isa_release_resources(device_t dev)
139{
140 struct aic_isa_softc *sc = device_get_softc(dev);
141
142 if (sc->sc_port)
143 bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->sc_port);
144 if (sc->sc_irq)
145 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq);
146 if (sc->sc_drq)
147 bus_release_resource(dev, SYS_RES_DRQ, 0, sc->sc_drq);
146 sc->sc_port = sc->sc_irq = sc->sc_drq = 0;
148 sc->sc_port = sc->sc_irq = sc->sc_drq = NULL;
149 mtx_destroy(&sc->sc_aic.lock);
147}
148
149static int
150aic_isa_probe(device_t dev)
151{
152 struct aic_isa_softc *sc = device_get_softc(dev);
153 struct aic_softc *aic = &sc->sc_aic;
154 int numports, i;

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

167 numports = AIC_ISA_NUMPORTS;
168 }
169
170 for (i = 0; i < numports; i++) {
171 if (bus_set_resource(dev, SYS_RES_IOPORT, 0, ports[i], 1))
172 continue;
173 if (aic_isa_alloc_resources(dev))
174 continue;
150}
151
152static int
153aic_isa_probe(device_t dev)
154{
155 struct aic_isa_softc *sc = device_get_softc(dev);
156 struct aic_softc *aic = &sc->sc_aic;
157 int numports, i;

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

170 numports = AIC_ISA_NUMPORTS;
171 }
172
173 for (i = 0; i < numports; i++) {
174 if (bus_set_resource(dev, SYS_RES_IOPORT, 0, ports[i], 1))
175 continue;
176 if (aic_isa_alloc_resources(dev))
177 continue;
175 if (!aic_probe(aic)) {
176 aic_isa_release_resources(dev);
178 if (aic_probe(aic) == 0)
177 break;
179 break;
178 }
179 aic_isa_release_resources(dev);
180 }
181
182 if (i == numports)
183 return (ENXIO);
184
185 porta = aic_inb(aic, PORTA);
180 aic_isa_release_resources(dev);
181 }
182
183 if (i == numports)
184 return (ENXIO);
185
186 porta = aic_inb(aic, PORTA);
187 aic_isa_release_resources(dev);
186 if (isa_get_irq(dev) == -1)
187 bus_set_resource(dev, SYS_RES_IRQ, 0, PORTA_IRQ(porta), 1);
188 if ((aic->flags & AIC_DMA_ENABLE) && isa_get_drq(dev) == -1)
189 bus_set_resource(dev, SYS_RES_DRQ, 0, PORTA_DRQ(porta), 1);
190 device_set_desc(dev, "Adaptec 6260/6360 SCSI controller");
191 return (0);
192}
193

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

206
207 error = aic_attach(aic);
208 if (error) {
209 device_printf(dev, "attach failed\n");
210 aic_isa_release_resources(dev);
211 return (error);
212 }
213
188 if (isa_get_irq(dev) == -1)
189 bus_set_resource(dev, SYS_RES_IRQ, 0, PORTA_IRQ(porta), 1);
190 if ((aic->flags & AIC_DMA_ENABLE) && isa_get_drq(dev) == -1)
191 bus_set_resource(dev, SYS_RES_DRQ, 0, PORTA_DRQ(porta), 1);
192 device_set_desc(dev, "Adaptec 6260/6360 SCSI controller");
193 return (0);
194}
195

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

208
209 error = aic_attach(aic);
210 if (error) {
211 device_printf(dev, "attach failed\n");
212 aic_isa_release_resources(dev);
213 return (error);
214 }
215
214 error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM|INTR_ENTROPY,
215 NULL, aic_intr, aic, &sc->sc_ih);
216 error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM | INTR_ENTROPY |
217 INTR_MPSAFE, NULL, aic_intr, aic, &sc->sc_ih);
216 if (error) {
217 device_printf(dev, "failed to register interrupt handler\n");
218 aic_isa_release_resources(dev);
219 return (error);
220 }
221 return (0);
222}
223

--- 39 unchanged lines hidden --- 		218 if (error) {
219 device_printf(dev, "failed to register interrupt handler\n");
220 aic_isa_release_resources(dev);
221 return (error);
222 }
223 return (0);
224}
225

--- 39 unchanged lines hidden ---