diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 22:23:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 22:23:49 -0500 |
commit | 017f51788ffdc16b0168143e38ea2c1f3551d983 (patch) | |
tree | 5ec33c9b638c4e86a1dcafd6528e8f6482549483 | |
parent | 17294ab2ca8e8c46f2e4825c55541b2b88e52bf4 (diff) | |
parent | d224b6269e4731a82f648bb0281ea1a4d8b3311d (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
icside: fix PCB version 6 support (v2)
tx4939ide: typo fix and minor cleanup
ide: add CS5536 host driver (v3)
ide: Force VIA IDE legacy interrupts for AmigaOne boards
IDE: Unregister and disable devices if initialization fails.
ide: fix ide_register_port() failure handling
ide: struct device - replace bus_id with dev_name(), dev_set_name()
ide-cd: fix DMA for non bio-backed requests
-rw-r--r-- | drivers/ide/Kconfig | 10 | ||||
-rw-r--r-- | drivers/ide/Makefile | 1 | ||||
-rw-r--r-- | drivers/ide/cs5536.c | 308 | ||||
-rw-r--r-- | drivers/ide/icside.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-acpi.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-cd.c | 3 | ||||
-rw-r--r-- | drivers/ide/ide-io.c | 9 | ||||
-rw-r--r-- | drivers/ide/ide-probe.c | 43 | ||||
-rw-r--r-- | drivers/ide/tx4939ide.c | 4 | ||||
-rw-r--r-- | drivers/ide/via82cxxx.c | 5 |
10 files changed, 371 insertions, 16 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index b1c6f68d98ce..3dad2299d9c5 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -465,6 +465,16 @@ config BLK_DEV_CS5535 | |||
465 | 465 | ||
466 | It is safe to say Y to this question. | 466 | It is safe to say Y to this question. |
467 | 467 | ||
468 | config BLK_DEV_CS5536 | ||
469 | tristate "CS5536 chipset support" | ||
470 | depends on X86_32 | ||
471 | select BLK_DEV_IDEDMA_PCI | ||
472 | help | ||
473 | This option enables support for the AMD CS5536 | ||
474 | companion chip used with the Geode LX processor family. | ||
475 | |||
476 | If unsure, say N. | ||
477 | |||
468 | config BLK_DEV_HPT366 | 478 | config BLK_DEV_HPT366 |
469 | tristate "HPT36X/37X chipset support" | 479 | tristate "HPT36X/37X chipset support" |
470 | select BLK_DEV_IDEDMA_PCI | 480 | select BLK_DEV_IDEDMA_PCI |
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index c2b9c93f0095..d0e3d7d5b467 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile | |||
@@ -43,6 +43,7 @@ obj-$(CONFIG_BLK_DEV_CMD64X) += cmd64x.o | |||
43 | obj-$(CONFIG_BLK_DEV_CS5520) += cs5520.o | 43 | obj-$(CONFIG_BLK_DEV_CS5520) += cs5520.o |
44 | obj-$(CONFIG_BLK_DEV_CS5530) += cs5530.o | 44 | obj-$(CONFIG_BLK_DEV_CS5530) += cs5530.o |
45 | obj-$(CONFIG_BLK_DEV_CS5535) += cs5535.o | 45 | obj-$(CONFIG_BLK_DEV_CS5535) += cs5535.o |
46 | obj-$(CONFIG_BLK_DEV_CS5536) += cs5536.o | ||
46 | obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o | 47 | obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o |
47 | obj-$(CONFIG_BLK_DEV_CY82C693) += cy82c693.o | 48 | obj-$(CONFIG_BLK_DEV_CY82C693) += cy82c693.o |
48 | obj-$(CONFIG_BLK_DEV_DELKIN) += delkin_cb.o | 49 | obj-$(CONFIG_BLK_DEV_DELKIN) += delkin_cb.o |
diff --git a/drivers/ide/cs5536.c b/drivers/ide/cs5536.c new file mode 100644 index 000000000000..7a62db719a46 --- /dev/null +++ b/drivers/ide/cs5536.c | |||
@@ -0,0 +1,308 @@ | |||
1 | /* | ||
2 | * CS5536 PATA support | ||
3 | * (C) 2007 Martin K. Petersen <mkp@mkp.net> | ||
4 | * (C) 2009 Bartlomiej Zolnierkiewicz | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | * | ||
19 | * Documentation: | ||
20 | * Available from AMD web site. | ||
21 | * | ||
22 | * The IDE timing registers for the CS5536 live in the Geode Machine | ||
23 | * Specific Register file and not PCI config space. Most BIOSes | ||
24 | * virtualize the PCI registers so the chip looks like a standard IDE | ||
25 | * controller. Unfortunately not all implementations get this right. | ||
26 | * In particular some have problems with unaligned accesses to the | ||
27 | * virtualized PCI registers. This driver always does full dword | ||
28 | * writes to work around the issue. Also, in case of a bad BIOS this | ||
29 | * driver can be loaded with the "msr=1" parameter which forces using | ||
30 | * the Machine Specific Registers to configure the device. | ||
31 | */ | ||
32 | |||
33 | #include <linux/kernel.h> | ||
34 | #include <linux/module.h> | ||
35 | #include <linux/pci.h> | ||
36 | #include <linux/init.h> | ||
37 | #include <linux/ide.h> | ||
38 | #include <asm/msr.h> | ||
39 | |||
40 | #define DRV_NAME "cs5536" | ||
41 | |||
42 | enum { | ||
43 | MSR_IDE_CFG = 0x51300010, | ||
44 | PCI_IDE_CFG = 0x40, | ||
45 | |||
46 | CFG = 0, | ||
47 | DTC = 2, | ||
48 | CAST = 3, | ||
49 | ETC = 4, | ||
50 | |||
51 | IDE_CFG_CHANEN = (1 << 1), | ||
52 | IDE_CFG_CABLE = (1 << 17) | (1 << 16), | ||
53 | |||
54 | IDE_D0_SHIFT = 24, | ||
55 | IDE_D1_SHIFT = 16, | ||
56 | IDE_DRV_MASK = 0xff, | ||
57 | |||
58 | IDE_CAST_D0_SHIFT = 6, | ||
59 | IDE_CAST_D1_SHIFT = 4, | ||
60 | IDE_CAST_DRV_MASK = 0x3, | ||
61 | |||
62 | IDE_CAST_CMD_SHIFT = 24, | ||
63 | IDE_CAST_CMD_MASK = 0xff, | ||
64 | |||
65 | IDE_ETC_UDMA_MASK = 0xc0, | ||
66 | }; | ||
67 | |||
68 | static int use_msr; | ||
69 | |||
70 | static int cs5536_read(struct pci_dev *pdev, int reg, u32 *val) | ||
71 | { | ||
72 | if (unlikely(use_msr)) { | ||
73 | u32 dummy; | ||
74 | |||
75 | rdmsr(MSR_IDE_CFG + reg, *val, dummy); | ||
76 | return 0; | ||
77 | } | ||
78 | |||
79 | return pci_read_config_dword(pdev, PCI_IDE_CFG + reg * 4, val); | ||
80 | } | ||
81 | |||
82 | static int cs5536_write(struct pci_dev *pdev, int reg, int val) | ||
83 | { | ||
84 | if (unlikely(use_msr)) { | ||
85 | wrmsr(MSR_IDE_CFG + reg, val, 0); | ||
86 | return 0; | ||
87 | } | ||
88 | |||
89 | return pci_write_config_dword(pdev, PCI_IDE_CFG + reg * 4, val); | ||
90 | } | ||
91 | |||
92 | static void cs5536_program_dtc(ide_drive_t *drive, u8 tim) | ||
93 | { | ||
94 | struct pci_dev *pdev = to_pci_dev(drive->hwif->dev); | ||
95 | int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT; | ||
96 | u32 dtc; | ||
97 | |||
98 | cs5536_read(pdev, DTC, &dtc); | ||
99 | dtc &= ~(IDE_DRV_MASK << dshift); | ||
100 | dtc |= tim << dshift; | ||
101 | cs5536_write(pdev, DTC, dtc); | ||
102 | } | ||
103 | |||
104 | /** | ||
105 | * cs5536_cable_detect - detect cable type | ||
106 | * @hwif: Port to detect on | ||
107 | * | ||
108 | * Perform cable detection for ATA66 capable cable. | ||
109 | * | ||
110 | * Returns a cable type. | ||
111 | */ | ||
112 | |||
113 | static u8 cs5536_cable_detect(ide_hwif_t *hwif) | ||
114 | { | ||
115 | struct pci_dev *pdev = to_pci_dev(hwif->dev); | ||
116 | u32 cfg; | ||
117 | |||
118 | cs5536_read(pdev, CFG, &cfg); | ||
119 | |||
120 | if (cfg & IDE_CFG_CABLE) | ||
121 | return ATA_CBL_PATA80; | ||
122 | else | ||
123 | return ATA_CBL_PATA40; | ||
124 | } | ||
125 | |||
126 | /** | ||
127 | * cs5536_set_pio_mode - PIO timing setup | ||
128 | * @drive: ATA device | ||
129 | * @pio: PIO mode number | ||
130 | */ | ||
131 | |||
132 | static void cs5536_set_pio_mode(ide_drive_t *drive, const u8 pio) | ||
133 | { | ||
134 | static const u8 drv_timings[5] = { | ||
135 | 0x98, 0x55, 0x32, 0x21, 0x20, | ||
136 | }; | ||
137 | |||
138 | static const u8 addr_timings[5] = { | ||
139 | 0x2, 0x1, 0x0, 0x0, 0x0, | ||
140 | }; | ||
141 | |||
142 | static const u8 cmd_timings[5] = { | ||
143 | 0x99, 0x92, 0x90, 0x22, 0x20, | ||
144 | }; | ||
145 | |||
146 | struct pci_dev *pdev = to_pci_dev(drive->hwif->dev); | ||
147 | ide_drive_t *pair = ide_get_pair_dev(drive); | ||
148 | int cshift = (drive->dn & 1) ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT; | ||
149 | u32 cast; | ||
150 | u8 cmd_pio = pio; | ||
151 | |||
152 | if (pair) | ||
153 | cmd_pio = min(pio, ide_get_best_pio_mode(pair, 255, 4)); | ||
154 | |||
155 | drive->drive_data &= (IDE_DRV_MASK << 8); | ||
156 | drive->drive_data |= drv_timings[pio]; | ||
157 | |||
158 | cs5536_program_dtc(drive, drv_timings[pio]); | ||
159 | |||
160 | cs5536_read(pdev, CAST, &cast); | ||
161 | |||
162 | cast &= ~(IDE_CAST_DRV_MASK << cshift); | ||
163 | cast |= addr_timings[pio] << cshift; | ||
164 | |||
165 | cast &= ~(IDE_CAST_CMD_MASK << IDE_CAST_CMD_SHIFT); | ||
166 | cast |= cmd_timings[cmd_pio] << IDE_CAST_CMD_SHIFT; | ||
167 | |||
168 | cs5536_write(pdev, CAST, cast); | ||
169 | } | ||
170 | |||
171 | /** | ||
172 | * cs5536_set_dma_mode - DMA timing setup | ||
173 | * @drive: ATA device | ||
174 | * @mode: DMA mode | ||
175 | */ | ||
176 | |||
177 | static void cs5536_set_dma_mode(ide_drive_t *drive, const u8 mode) | ||
178 | { | ||
179 | static const u8 udma_timings[6] = { | ||
180 | 0xc2, 0xc1, 0xc0, 0xc4, 0xc5, 0xc6, | ||
181 | }; | ||
182 | |||
183 | static const u8 mwdma_timings[3] = { | ||
184 | 0x67, 0x21, 0x20, | ||
185 | }; | ||
186 | |||
187 | struct pci_dev *pdev = to_pci_dev(drive->hwif->dev); | ||
188 | int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT; | ||
189 | u32 etc; | ||
190 | |||
191 | cs5536_read(pdev, ETC, &etc); | ||
192 | |||
193 | if (mode >= XFER_UDMA_0) { | ||
194 | etc &= ~(IDE_DRV_MASK << dshift); | ||
195 | etc |= udma_timings[mode - XFER_UDMA_0] << dshift; | ||
196 | } else { /* MWDMA */ | ||
197 | etc &= ~(IDE_ETC_UDMA_MASK << dshift); | ||
198 | drive->drive_data &= IDE_DRV_MASK; | ||
199 | drive->drive_data |= mwdma_timings[mode - XFER_MW_DMA_0] << 8; | ||
200 | } | ||
201 | |||
202 | cs5536_write(pdev, ETC, etc); | ||
203 | } | ||
204 | |||
205 | static void cs5536_dma_start(ide_drive_t *drive) | ||
206 | { | ||
207 | if (drive->current_speed < XFER_UDMA_0 && | ||
208 | (drive->drive_data >> 8) != (drive->drive_data & IDE_DRV_MASK)) | ||
209 | cs5536_program_dtc(drive, drive->drive_data >> 8); | ||
210 | |||
211 | ide_dma_start(drive); | ||
212 | } | ||
213 | |||
214 | static int cs5536_dma_end(ide_drive_t *drive) | ||
215 | { | ||
216 | int ret = ide_dma_end(drive); | ||
217 | |||
218 | if (drive->current_speed < XFER_UDMA_0 && | ||
219 | (drive->drive_data >> 8) != (drive->drive_data & IDE_DRV_MASK)) | ||
220 | cs5536_program_dtc(drive, drive->drive_data & IDE_DRV_MASK); | ||
221 | |||
222 | return ret; | ||
223 | } | ||
224 | |||
225 | static const struct ide_port_ops cs5536_port_ops = { | ||
226 | .set_pio_mode = cs5536_set_pio_mode, | ||
227 | .set_dma_mode = cs5536_set_dma_mode, | ||
228 | .cable_detect = cs5536_cable_detect, | ||
229 | }; | ||
230 | |||
231 | static const struct ide_dma_ops cs5536_dma_ops = { | ||
232 | .dma_host_set = ide_dma_host_set, | ||
233 | .dma_setup = ide_dma_setup, | ||
234 | .dma_exec_cmd = ide_dma_exec_cmd, | ||
235 | .dma_start = cs5536_dma_start, | ||
236 | .dma_end = cs5536_dma_end, | ||
237 | .dma_test_irq = ide_dma_test_irq, | ||
238 | .dma_lost_irq = ide_dma_lost_irq, | ||
239 | .dma_timeout = ide_dma_timeout, | ||
240 | }; | ||
241 | |||
242 | static const struct ide_port_info cs5536_info = { | ||
243 | .name = DRV_NAME, | ||
244 | .port_ops = &cs5536_port_ops, | ||
245 | .dma_ops = &cs5536_dma_ops, | ||
246 | .host_flags = IDE_HFLAG_SINGLE, | ||
247 | .pio_mask = ATA_PIO4, | ||
248 | .mwdma_mask = ATA_MWDMA2, | ||
249 | .udma_mask = ATA_UDMA5, | ||
250 | }; | ||
251 | |||
252 | /** | ||
253 | * cs5536_init_one | ||
254 | * @dev: PCI device | ||
255 | * @id: Entry in match table | ||
256 | */ | ||
257 | |||
258 | static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id) | ||
259 | { | ||
260 | u32 cfg; | ||
261 | |||
262 | if (use_msr) | ||
263 | printk(KERN_INFO DRV_NAME ": Using MSR regs instead of PCI\n"); | ||
264 | |||
265 | cs5536_read(dev, CFG, &cfg); | ||
266 | |||
267 | if ((cfg & IDE_CFG_CHANEN) == 0) { | ||
268 | printk(KERN_ERR DRV_NAME ": disabled by BIOS\n"); | ||
269 | return -ENODEV; | ||
270 | } | ||
271 | |||
272 | return ide_pci_init_one(dev, &cs5536_info, NULL); | ||
273 | } | ||
274 | |||
275 | static const struct pci_device_id cs5536_pci_tbl[] = { | ||
276 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), }, | ||
277 | { }, | ||
278 | }; | ||
279 | |||
280 | static struct pci_driver cs5536_pci_driver = { | ||
281 | .name = DRV_NAME, | ||
282 | .id_table = cs5536_pci_tbl, | ||
283 | .probe = cs5536_init_one, | ||
284 | .remove = ide_pci_remove, | ||
285 | .suspend = ide_pci_suspend, | ||
286 | .resume = ide_pci_resume, | ||
287 | }; | ||
288 | |||
289 | static int __init cs5536_init(void) | ||
290 | { | ||
291 | return pci_register_driver(&cs5536_pci_driver); | ||
292 | } | ||
293 | |||
294 | static void __exit cs5536_exit(void) | ||
295 | { | ||
296 | pci_unregister_driver(&cs5536_pci_driver); | ||
297 | } | ||
298 | |||
299 | MODULE_AUTHOR("Martin K. Petersen, Bartlomiej Zolnierkiewicz"); | ||
300 | MODULE_DESCRIPTION("low-level driver for the CS5536 IDE controller"); | ||
301 | MODULE_LICENSE("GPL"); | ||
302 | MODULE_DEVICE_TABLE(pci, cs5536_pci_tbl); | ||
303 | |||
304 | module_param_named(msr, use_msr, int, 0644); | ||
305 | MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)"); | ||
306 | |||
307 | module_init(cs5536_init); | ||
308 | module_exit(cs5536_exit); | ||
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 97a35c667aee..415d7e24f2b6 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c | |||
@@ -534,7 +534,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
534 | d.dma_ops = NULL; | 534 | d.dma_ops = NULL; |
535 | } | 535 | } |
536 | 536 | ||
537 | ret = ide_host_register(host, NULL, hws); | 537 | ret = ide_host_register(host, &d, hws); |
538 | if (ret) | 538 | if (ret) |
539 | goto err_free; | 539 | goto err_free; |
540 | 540 | ||
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index d8f295bdad76..ec7d07fa570a 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
@@ -282,7 +282,7 @@ static int do_drive_get_GTF(ide_drive_t *drive, | |||
282 | port = hwif->channel ? drive->dn - 2: drive->dn; | 282 | port = hwif->channel ? drive->dn - 2: drive->dn; |
283 | 283 | ||
284 | DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n", | 284 | DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n", |
285 | hwif->name, dev->bus_id, port, hwif->channel); | 285 | hwif->name, dev_name(dev), port, hwif->channel); |
286 | 286 | ||
287 | if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) { | 287 | if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) { |
288 | DEBPRINT("%s drive %d:%d not present\n", | 288 | DEBPRINT("%s drive %d:%d not present\n", |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index cae69372cf45..0bfeb0c79d6e 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -787,6 +787,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) | |||
787 | if (blk_fs_request(rq)) { | 787 | if (blk_fs_request(rq)) { |
788 | ide_end_request(drive, 1, rq->nr_sectors); | 788 | ide_end_request(drive, 1, rq->nr_sectors); |
789 | return ide_stopped; | 789 | return ide_stopped; |
790 | } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) { | ||
791 | ide_end_request(drive, 1, 1); | ||
792 | return ide_stopped; | ||
790 | } | 793 | } |
791 | goto end_request; | 794 | goto end_request; |
792 | } | 795 | } |
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index cc163319dfbd..9ee51adf567f 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -418,11 +418,14 @@ void ide_map_sg(ide_drive_t *drive, struct request *rq) | |||
418 | ide_hwif_t *hwif = drive->hwif; | 418 | ide_hwif_t *hwif = drive->hwif; |
419 | struct scatterlist *sg = hwif->sg_table; | 419 | struct scatterlist *sg = hwif->sg_table; |
420 | 420 | ||
421 | if (rq->cmd_type != REQ_TYPE_ATA_TASKFILE) { | 421 | if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) { |
422 | hwif->sg_nents = blk_rq_map_sg(drive->queue, rq, sg); | ||
423 | } else { | ||
424 | sg_init_one(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE); | 422 | sg_init_one(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE); |
425 | hwif->sg_nents = 1; | 423 | hwif->sg_nents = 1; |
424 | } else if (!rq->bio) { | ||
425 | sg_init_one(sg, rq->data, rq->data_len); | ||
426 | hwif->sg_nents = 1; | ||
427 | } else { | ||
428 | hwif->sg_nents = blk_rq_map_sg(drive->queue, rq, sg); | ||
426 | } | 429 | } |
427 | } | 430 | } |
428 | 431 | ||
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 0db1ed9f5fc2..ce0818a993f6 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1467,6 +1467,30 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws) | |||
1467 | } | 1467 | } |
1468 | EXPORT_SYMBOL_GPL(ide_host_alloc); | 1468 | EXPORT_SYMBOL_GPL(ide_host_alloc); |
1469 | 1469 | ||
1470 | static void ide_port_free(ide_hwif_t *hwif) | ||
1471 | { | ||
1472 | ide_port_free_devices(hwif); | ||
1473 | ide_free_port_slot(hwif->index); | ||
1474 | kfree(hwif); | ||
1475 | } | ||
1476 | |||
1477 | static void ide_disable_port(ide_hwif_t *hwif) | ||
1478 | { | ||
1479 | struct ide_host *host = hwif->host; | ||
1480 | int i; | ||
1481 | |||
1482 | printk(KERN_INFO "%s: disabling port\n", hwif->name); | ||
1483 | |||
1484 | for (i = 0; i < MAX_HOST_PORTS; i++) { | ||
1485 | if (host->ports[i] == hwif) { | ||
1486 | host->ports[i] = NULL; | ||
1487 | host->n_ports--; | ||
1488 | } | ||
1489 | } | ||
1490 | |||
1491 | ide_port_free(hwif); | ||
1492 | } | ||
1493 | |||
1470 | int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | 1494 | int ide_host_register(struct ide_host *host, const struct ide_port_info *d, |
1471 | hw_regs_t **hws) | 1495 | hw_regs_t **hws) |
1472 | { | 1496 | { |
@@ -1507,8 +1531,12 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | |||
1507 | hwif->present = 1; | 1531 | hwif->present = 1; |
1508 | 1532 | ||
1509 | if (hwif->chipset != ide_4drives || !hwif->mate || | 1533 | if (hwif->chipset != ide_4drives || !hwif->mate || |
1510 | !hwif->mate->present) | 1534 | !hwif->mate->present) { |
1511 | ide_register_port(hwif); | 1535 | if (ide_register_port(hwif)) { |
1536 | ide_disable_port(hwif); | ||
1537 | continue; | ||
1538 | } | ||
1539 | } | ||
1512 | 1540 | ||
1513 | if (hwif->present) | 1541 | if (hwif->present) |
1514 | ide_port_tune_devices(hwif); | 1542 | ide_port_tune_devices(hwif); |
@@ -1521,7 +1549,8 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | |||
1521 | if (hwif_init(hwif) == 0) { | 1549 | if (hwif_init(hwif) == 0) { |
1522 | printk(KERN_INFO "%s: failed to initialize IDE " | 1550 | printk(KERN_INFO "%s: failed to initialize IDE " |
1523 | "interface\n", hwif->name); | 1551 | "interface\n", hwif->name); |
1524 | hwif->present = 0; | 1552 | device_unregister(&hwif->gendev); |
1553 | ide_disable_port(hwif); | ||
1525 | continue; | 1554 | continue; |
1526 | } | 1555 | } |
1527 | 1556 | ||
@@ -1660,12 +1689,8 @@ void ide_host_free(struct ide_host *host) | |||
1660 | int i; | 1689 | int i; |
1661 | 1690 | ||
1662 | ide_host_for_each_port(i, hwif, host) { | 1691 | ide_host_for_each_port(i, hwif, host) { |
1663 | if (hwif == NULL) | 1692 | if (hwif) |
1664 | continue; | 1693 | ide_port_free(hwif); |
1665 | |||
1666 | ide_port_free_devices(hwif); | ||
1667 | ide_free_port_slot(hwif->index); | ||
1668 | kfree(hwif); | ||
1669 | } | 1694 | } |
1670 | 1695 | ||
1671 | kfree(host); | 1696 | kfree(host); |
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 882f6f07c476..40b0812a045c 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c | |||
@@ -261,9 +261,9 @@ static int tx4939ide_build_dmatable(ide_drive_t *drive, struct request *rq) | |||
261 | bcount = cur_len; | 261 | bcount = cur_len; |
262 | /* | 262 | /* |
263 | * This workaround for zero count seems required. | 263 | * This workaround for zero count seems required. |
264 | * (standard ide_build_dmatable do it too) | 264 | * (standard ide_build_dmatable does it too) |
265 | */ | 265 | */ |
266 | if ((bcount & 0xffff) == 0x0000) | 266 | if (bcount == 0x10000) |
267 | bcount = 0x8000; | 267 | bcount = 0x8000; |
268 | *table++ = bcount & 0xffff; | 268 | *table++ = bcount & 0xffff; |
269 | *table++ = cur_addr; | 269 | *table++ = cur_addr; |
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c index 703c3eeb20a8..6092fe3f409d 100644 --- a/drivers/ide/via82cxxx.c +++ b/drivers/ide/via82cxxx.c | |||
@@ -448,6 +448,11 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i | |||
448 | d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS; | 448 | d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS; |
449 | #endif | 449 | #endif |
450 | 450 | ||
451 | #ifdef CONFIG_AMIGAONE | ||
452 | if (machine_is(amigaone)) | ||
453 | d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS; | ||
454 | #endif | ||
455 | |||
451 | d.udma_mask = via_config->udma_mask; | 456 | d.udma_mask = via_config->udma_mask; |
452 | 457 | ||
453 | vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); | 458 | vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); |