libata fixes
PATCH 1/1 libata fixes
FWIW: Immediately after a release (such as today's 2.6.19), I keep my 'upstream-fixes' branch alive, so that I can fast-forward bug fixes upstream without my huge For-Next-Release pending queue ('upstream') getting pushed.
That's what this is. And I'll be sending a similar netdev bug fix push.
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/ahci.c | 27 ++++++++++++++++++++++----- drivers/ata/ata_generic.c | 1 + drivers/ata/pata_ali.c | 1 + drivers/ata/pata_amd.c | 1 + drivers/ata/pata_artop.c | 1 + drivers/ata/pata_atiixp.c | 1 + drivers/ata/pata_cmd64x.c | 1 + drivers/ata/pata_cs5520.c | 1 + drivers/ata/pata_cs5530.c | 1 + drivers/ata/pata_cs5535.c | 1 + drivers/ata/pata_cypress.c | 1 + drivers/ata/pata_efar.c | 1 + drivers/ata/pata_hpt366.c | 1 + drivers/ata/pata_hpt37x.c | 1 + drivers/ata/pata_hpt3x2n.c | 1 + drivers/ata/pata_hpt3x3.c | 1 + drivers/ata/pata_isapnp.c | 1 + drivers/ata/pata_it821x.c | 1 + drivers/ata/pata_jmicron.c | 1 + drivers/ata/pata_legacy.c | 1 + drivers/ata/pata_mpiix.c | 1 + drivers/ata/pata_netcell.c | 1 + drivers/ata/pata_ns87410.c | 1 + drivers/ata/pata_oldpiix.c | 1 + drivers/ata/pata_opti.c | 1 + drivers/ata/pata_optidma.c | 1 + drivers/ata/pata_pcmcia.c | 1 + drivers/ata/pata_pdc2027x.c | 1 + drivers/ata/pata_pdc202xx_old.c | 1 + drivers/ata/pata_qdi.c | 1 + drivers/ata/pata_radisys.c | 1 + drivers/ata/pata_rz1000.c | 1 + drivers/ata/pata_sc1200.c | 1 + drivers/ata/pata_serverworks.c | 1 + drivers/ata/pata_sil680.c | 1 + drivers/ata/pata_sis.c | 1 + drivers/ata/pata_sl82c105.c | 1 + drivers/ata/pata_triflex.c | 1 + drivers/ata/pata_via.c | 1 + 39 files changed, 60 insertions(+), 5 deletions(-)
Tejun Heo:
ahci: ignore PORT_IRQ_IF_ERR on JMB controllers
libata: add missing sht->slave_destroy
drivers/ata/ahci.c +22 -5
@@ -78,6 +78,7 @@ enum { board_ahci =0 , board_ahci_vt8251 =1 , + board_ahci_ign_iferr =2 ,/* global controller registers */ HOST_CAP = 0x00, /* host capabilities */
@@ -168,6 +169,7 @@ enum {/* ap->flags bits */ AHCI_FLAG_RESET_NEEDS_CLO = (1 <<24 ),AHCI_FLAG_NO_NCQ = (1 <<25 ), + AHCI_FLAG_IGN_IRQ_IF_ERR = (1 << 26), /* ignore IRQ_IF_ERR */ }; struct ahci_cmd_hdr {
@@ -295,6 +297,17 @@ static const struct ata_port_info ahci_p .udma_mask = 0x7f, /* udma0-6 ; FIXME */ .port_ops = &ahci_ops, }, +/* board_ahci_ign_iferr */ + { + .sht = &ahci_sht, + .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | + ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | + ATA_FLAG_SKIP_D2H_BSY | + AHCI_FLAG_IGN_IRQ_IF_ERR, + .pio_mask = 0x1f, /* pio0-4 */ + .udma_mask = 0x7f, /* udma0-6 ; FIXME */ + .port_ops = &ahci_ops, + }, };static const struct pci_device_id ahci_pci_tbl[] = {
@@ -327,11 +340,11 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(INTEL, 0x294e), board_ahci }, /* ICH9M *//* JMicron */ - { PCI_VDEVICE(JMICRON, 0x2360), board_ahci }, /* JMicron JMB360 */ - { PCI_VDEVICE(JMICRON, 0x2361), board_ahci }, /* JMicron JMB361 */ - { PCI_VDEVICE(JMICRON, 0x2363), board_ahci }, /* JMicron JMB363 */ - { PCI_VDEVICE(JMICRON, 0x2365), board_ahci }, /* JMicron JMB365 */ - { PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */ + { PCI_VDEVICE(JMICRON, 0x2360), board_ahci_ign_iferr }, /* JMB360 */ + { PCI_VDEVICE(JMICRON, 0x2361), board_ahci_ign_iferr }, /* JMB361 */ + { PCI_VDEVICE(JMICRON, 0x2363), board_ahci_ign_iferr }, /* JMB363 */ + { PCI_VDEVICE(JMICRON, 0x2365), board_ahci_ign_iferr }, /* JMB365 */ + { PCI_VDEVICE(JMICRON, 0x2366), board_ahci_ign_iferr }, /* JMB366 *//* ATI */ { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
@@ -980,6 +993,10 @@ static void ahci_error_intr(struct ata_p/* analyze @irq_stat */ ata_ehi_push_desc (ehi,"irq_stat 0x%08x" , irq_stat); +/* some controllers set IRQ_IF_ERR on device errors, ignore it */ +if (ap->flags &AHCI_FLAG_IGN_IRQ_IF_ERR ) + irq_stat &= ~PORT_IRQ_IF_ERR ; +if (irq_stat &PORT_IRQ_TF_ERR ) err_mask |=AC_ERR_DEV ;
drivers/ata/ata_generic.c +1 -0
@@ -116,6 +116,7 @@ static struct scsi_host_template generic .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_ali.c +1 -0
@@ -346,6 +346,7 @@ static struct scsi_host_template ali_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_amd.c +1 -0
@@ -333,6 +333,7 @@ static struct scsi_host_template amd_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_artop.c +1 -0
@@ -314,6 +314,7 @@ static struct scsi_host_template artop_s .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_atiixp.c +1 -0
@@ -216,6 +216,7 @@ static struct scsi_host_template atiixp_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cmd64x.c +1 -0
@@ -275,6 +275,7 @@ static struct scsi_host_template cmd64x_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cs5520.c +1 -0
@@ -166,6 +166,7 @@ static struct scsi_host_template cs5520_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cs5530.c +1 -0
@@ -180,6 +180,7 @@ static struct scsi_host_template cs5530_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cs5535.c +1 -0
@@ -184,6 +184,7 @@ static struct scsi_host_template cs5535_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cypress.c +1 -0
@@ -135,6 +135,7 @@ static struct scsi_host_template cy82c69 .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_efar.c +1 -0
@@ -233,6 +233,7 @@ static struct scsi_host_template efar_sh .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_hpt366.c +1 -0
@@ -329,6 +329,7 @@ static struct scsi_host_template hpt36x_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_hpt37x.c +1 -0
@@ -775,6 +775,7 @@ static struct scsi_host_template hpt37x_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_hpt3x2n.c +1 -0
@@ -341,6 +341,7 @@ static struct scsi_host_template hpt3x2n .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_hpt3x3.c +1 -0
@@ -118,6 +118,7 @@ static struct scsi_host_template hpt3x3_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_isapnp.c +1 -0
@@ -34,6 +34,7 @@ static struct scsi_host_template isapnp_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_it821x.c +1 -0
@@ -675,6 +675,7 @@ static struct scsi_host_template it821x_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_jmicron.c +1 -0
@@ -136,6 +136,7 @@ static struct scsi_host_template jmicron .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, };
drivers/ata/pata_legacy.c +1 -0
@@ -135,6 +135,7 @@ static struct scsi_host_template legacy_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_mpiix.c +1 -0
@@ -166,6 +166,7 @@ static struct scsi_host_template mpiix_s .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_netcell.c +1 -0
@@ -62,6 +62,7 @@ static struct scsi_host_template netcell .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, };
drivers/ata/pata_ns87410.c +1 -0
@@ -156,6 +156,7 @@ static struct scsi_host_template ns87410 .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_oldpiix.c +1 -0
@@ -231,6 +231,7 @@ static struct scsi_host_template oldpiix .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_opti.c +1 -0
@@ -202,6 +202,7 @@ static struct scsi_host_template opti_sh .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_optidma.c +1 -0
@@ -359,6 +359,7 @@ static struct scsi_host_template optidma .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_pcmcia.c +1 -0
@@ -69,6 +69,7 @@ static struct scsi_host_template pcmcia_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_pdc2027x.c +1 -0
@@ -141,6 +141,7 @@ static struct scsi_host_template pdc2027 .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_pdc202xx_old.c +1 -0
@@ -269,6 +269,7 @@ static struct scsi_host_template pdc_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_qdi.c +1 -0
@@ -164,6 +164,7 @@ static struct scsi_host_template qdi_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_radisys.c +1 -0
@@ -227,6 +227,7 @@ static struct scsi_host_template radisys .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_rz1000.c +1 -0
@@ -90,6 +90,7 @@ static struct scsi_host_template rz1000_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_sc1200.c +1 -0
@@ -193,6 +193,7 @@ static struct scsi_host_template sc1200_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_serverworks.c +1 -0
@@ -325,6 +325,7 @@ static struct scsi_host_template serverw .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_sil680.c +1 -0
@@ -225,6 +225,7 @@ static struct scsi_host_template sil680_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_sis.c +1 -0
@@ -545,6 +545,7 @@ static struct scsi_host_template sis_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_sl82c105.c +1 -0
@@ -237,6 +237,7 @@ static struct scsi_host_template sl82c10 .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_triflex.c +1 -0
@@ -192,6 +192,7 @@ static struct scsi_host_template triflex .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_via.c +1 -0
@@ -295,6 +295,7 @@ static struct scsi_host_template via_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jeff Garzik escreveu:
drivers/ata/pata_sil680.c static struct scsi_host_template sil680_ · line 230
Quoted 9 lines
drivers/ata/pata_sil680.c +1
-0@@ -225,6 +225,7 @@ static struct scsi_host_template sil680_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
I save this text above, but when I run "patch -p1", I receive this error message:
"missing header for unified diff at line 3 of patch patching file drivers/ata/pata_sil680.c"
- --
Renato S. Yamane
Fingerprint: 68AE A381 938A F4B9 8A23 D11A E351 5030 D420 515A PGP Server: http://pgp.mit.edu/ --> KeyID: 0xD420515A
<http://www.renatoyamane.com>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFFbwFJ41FQMNQgUVoRAgYNAJ489ilJfzO/J0U1TK7u1AA1vqVzgwCgjaC9 E/PuMo0LHV/6Mpi5Q0nd0c8=
=s3AJ
-----END PGP SIGNATURE-----
Renato S. Yamane escreveu:
Quoted 14 lines
Jeff Garzik escreveu:
drivers/ata/pata_sil680.c static struct scsi_host_template sil680_ · line 230
Quoted 9 lines
drivers/ata/pata_sil680.c +1
-0@@ -225,6 +225,7 @@ static struct scsi_host_template sil680_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };I save this text above, but when I run "patch -p1", I receive this error message:
Quoted 2 lines
"missing header for unified diff at line 3 of patch patching file
drivers/ata/pata_sil680.c"
And, if I try apply this patch (in Kernel 2.6.19) attachment, I receive this error message:
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 295 with fuzz 2.
This error is shown after some messages:
"patching file drivers/ata/pata_xxx"
Signature · 4 lines
Renato S. Yamane Fingerprint: 68AE A381 938A F4B9 8A23 D11A E351 5030 D420 515A PGP Server: http://pgp.mit.edu/ --> KeyID: 0xD420515A <http://www.renatoyamane.com>
drivers/ata/ahci.c +22 -5
@@ -78,6 +78,7 @@ enum { board_ahci =0 , board_ahci_vt8251 =1 , + board_ahci_ign_iferr =2 ,/* global controller registers */ HOST_CAP = 0x00, /* host capabilities */
@@ -168,6 +169,7 @@ enum {/* ap->flags bits */ AHCI_FLAG_RESET_NEEDS_CLO = (1 <<24 ),AHCI_FLAG_NO_NCQ = (1 <<25 ), + AHCI_FLAG_IGN_IRQ_IF_ERR = (1 << 26), /* ignore IRQ_IF_ERR */ }; struct ahci_cmd_hdr {
@@ -295,6 +297,17 @@ static const struct ata_port_info ahci_p .udma_mask = 0x7f, /* udma0-6 ; FIXME */ .port_ops = &ahci_ops, }, +/* board_ahci_ign_iferr */ + { + .sht = &ahci_sht, + .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | + ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | + ATA_FLAG_SKIP_D2H_BSY | + AHCI_FLAG_IGN_IRQ_IF_ERR, + .pio_mask = 0x1f, /* pio0-4 */ + .udma_mask = 0x7f, /* udma0-6 ; FIXME */ + .port_ops = &ahci_ops, + }, };static const struct pci_device_id ahci_pci_tbl[] = {
@@ -327,11 +340,11 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(INTEL, 0x294e), board_ahci }, /* ICH9M *//* JMicron */ - { PCI_VDEVICE(JMICRON, 0x2360), board_ahci }, /* JMicron JMB360 */ - { PCI_VDEVICE(JMICRON, 0x2361), board_ahci }, /* JMicron JMB361 */ - { PCI_VDEVICE(JMICRON, 0x2363), board_ahci }, /* JMicron JMB363 */ - { PCI_VDEVICE(JMICRON, 0x2365), board_ahci }, /* JMicron JMB365 */ - { PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */ + { PCI_VDEVICE(JMICRON, 0x2360), board_ahci_ign_iferr }, /* JMB360 */ + { PCI_VDEVICE(JMICRON, 0x2361), board_ahci_ign_iferr }, /* JMB361 */ + { PCI_VDEVICE(JMICRON, 0x2363), board_ahci_ign_iferr }, /* JMB363 */ + { PCI_VDEVICE(JMICRON, 0x2365), board_ahci_ign_iferr }, /* JMB365 */ + { PCI_VDEVICE(JMICRON, 0x2366), board_ahci_ign_iferr }, /* JMB366 *//* ATI */ { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
@@ -980,6 +993,10 @@ static void ahci_error_intr(struct ata_p/* analyze @irq_stat */ ata_ehi_push_desc (ehi,"irq_stat 0x%08x" , irq_stat); +/* some controllers set IRQ_IF_ERR on device errors, ignore it */ +if (ap->flags &AHCI_FLAG_IGN_IRQ_IF_ERR ) + irq_stat &= ~PORT_IRQ_IF_ERR ; +if (irq_stat &PORT_IRQ_TF_ERR ) err_mask |=AC_ERR_DEV ;
drivers/ata/ata_generic.c +1 -0
@@ -116,6 +116,7 @@ static struct scsi_host_template generic .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_ali.c +1 -0
@@ -346,6 +346,7 @@ static struct scsi_host_template ali_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_amd.c +1 -0
@@ -333,6 +333,7 @@ static struct scsi_host_template amd_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_artop.c +1 -0
@@ -314,6 +314,7 @@ static struct scsi_host_template artop_s .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_atiixp.c +1 -0
@@ -216,6 +216,7 @@ static struct scsi_host_template atiixp_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cmd64x.c +1 -0
@@ -275,6 +275,7 @@ static struct scsi_host_template cmd64x_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cs5520.c +1 -0
@@ -166,6 +166,7 @@ static struct scsi_host_template cs5520_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cs5530.c +1 -0
@@ -180,6 +180,7 @@ static struct scsi_host_template cs5530_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cs5535.c +1 -0
@@ -184,6 +184,7 @@ static struct scsi_host_template cs5535_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_cypress.c +1 -0
@@ -135,6 +135,7 @@ static struct scsi_host_template cy82c69 .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_efar.c +1 -0
@@ -233,6 +233,7 @@ static struct scsi_host_template efar_sh .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_hpt366.c +1 -0
@@ -329,6 +329,7 @@ static struct scsi_host_template hpt36x_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_hpt37x.c +1 -0
@@ -775,6 +775,7 @@ static struct scsi_host_template hpt37x_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_hpt3x2n.c +1 -0
@@ -341,6 +341,7 @@ static struct scsi_host_template hpt3x2n .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_hpt3x3.c +1 -0
@@ -118,6 +118,7 @@ static struct scsi_host_template hpt3x3_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_isapnp.c +1 -0
@@ -34,6 +34,7 @@ static struct scsi_host_template isapnp_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_it821x.c +1 -0
@@ -675,6 +675,7 @@ static struct scsi_host_template it821x_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_jmicron.c +1 -0
@@ -136,6 +136,7 @@ static struct scsi_host_template jmicron .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, };
drivers/ata/pata_legacy.c +1 -0
@@ -135,6 +135,7 @@ static struct scsi_host_template legacy_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_mpiix.c +1 -0
@@ -166,6 +166,7 @@ static struct scsi_host_template mpiix_s .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_netcell.c +1 -0
@@ -62,6 +62,7 @@ static struct scsi_host_template netcell .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, };
drivers/ata/pata_ns87410.c +1 -0
@@ -156,6 +156,7 @@ static struct scsi_host_template ns87410 .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_oldpiix.c +1 -0
@@ -231,6 +231,7 @@ static struct scsi_host_template oldpiix .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_opti.c +1 -0
@@ -202,6 +202,7 @@ static struct scsi_host_template opti_sh .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_optidma.c +1 -0
@@ -359,6 +359,7 @@ static struct scsi_host_template optidma .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_pcmcia.c +1 -0
@@ -69,6 +69,7 @@ static struct scsi_host_template pcmcia_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_pdc2027x.c +1 -0
@@ -141,6 +141,7 @@ static struct scsi_host_template pdc2027 .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_pdc202xx_old.c +1 -0
@@ -269,6 +269,7 @@ static struct scsi_host_template pdc_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_qdi.c +1 -0
@@ -164,6 +164,7 @@ static struct scsi_host_template qdi_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_radisys.c +1 -0
@@ -227,6 +227,7 @@ static struct scsi_host_template radisys .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_rz1000.c +1 -0
@@ -90,6 +90,7 @@ static struct scsi_host_template rz1000_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_sc1200.c +1 -0
@@ -193,6 +193,7 @@ static struct scsi_host_template sc1200_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_serverworks.c +1 -0
@@ -325,6 +325,7 @@ static struct scsi_host_template serverw .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_sil680.c +1 -0
@@ -225,6 +225,7 @@ static struct scsi_host_template sil680_ .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_sis.c +1 -0
@@ -545,6 +545,7 @@ static struct scsi_host_template sis_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_sl82c105.c +1 -0
@@ -237,6 +237,7 @@ static struct scsi_host_template sl82c10 .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_triflex.c +1 -0
@@ -192,6 +192,7 @@ static struct scsi_host_template triflex .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_via.c +1 -0
@@ -295,6 +295,7 @@ static struct scsi_host_template via_sht .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };