Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a80dad authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: convert several bmdma-style controllers to new EH, take #3 



Convert sata_sis, svw, uli and vsc drivers to new EH.  All the drivers
used to specify ATA_FLAG_SATA_RESET to tell libata to use SATA
hardreset instead of SRST.  This patch makes all the converted drivers
use the standard bmdma error handler which uses both SRST and SATA
hardreset.

All the controllers should be able to perform SRST but still needs
verification.  If some of the controllers can't do SRST, it will be
very easy to spot as it will show up during boot probing.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 40ef1d8d

drivers/scsi/sata_sis.c

+5 −4
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ static const struct ata_port_operations sis_ops = { 
	.check_status		= ata_check_status,

	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,

	.phy_reset		= sata_phy_reset,

	.bmdma_setup            = ata_bmdma_setup,

	.bmdma_start            = ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,
@@ -115,7 +114,10 @@ static const struct ata_port_operations sis_ops = { 
	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_pio_data_xfer,

	.eng_timeout		= ata_eng_timeout,

	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= ata_bmdma_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

	.scr_read		= sis_scr_read,
@@ -127,8 +129,7 @@ static const struct ata_port_operations sis_ops = { 


static struct ata_port_info sis_port_info = {

	.sht		= &sis_sht,

	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |

			  ATA_FLAG_NO_LEGACY,

	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

	.pio_mask	= 0x1f,

	.mwdma_mask	= 0x7,

	.udma_mask	= 0x7f,

drivers/scsi/sata_svw.c

+6 −4
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ static const struct ata_port_operations k2_sata_ops = { 
	.check_status		= k2_stat_check_status,

	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,

	.phy_reset		= sata_phy_reset,

	.bmdma_setup		= k2_bmdma_setup_mmio,

	.bmdma_start		= k2_bmdma_start_mmio,

	.bmdma_stop		= ata_bmdma_stop,
@@ -322,7 +321,10 @@ static const struct ata_port_operations k2_sata_ops = { 
	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_mmio_data_xfer,

	.eng_timeout		= ata_eng_timeout,

	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= ata_bmdma_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

	.scr_read		= k2_sata_scr_read,
@@ -422,8 +424,8 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e 
	writel(0x0, mmio_base + K2_SATA_SIM_OFFSET);



	probe_ent->sht = &k2_sata_sht;

	probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |

				ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;

	probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				ATA_FLAG_MMIO;

	probe_ent->port_ops = &k2_sata_ops;

	probe_ent->n_ports = 4;

	probe_ent->irq = pdev->irq;

drivers/scsi/sata_uli.c

+5 −5
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ static const struct ata_port_operations uli_ops = { 
	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.phy_reset		= sata_phy_reset,



	.bmdma_setup            = ata_bmdma_setup,

	.bmdma_start            = ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,
@@ -113,7 +111,10 @@ static const struct ata_port_operations uli_ops = { 
	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_pio_data_xfer,



	.eng_timeout		= ata_eng_timeout,

	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= ata_bmdma_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,



	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,
@@ -128,8 +129,7 @@ static const struct ata_port_operations uli_ops = { 


static struct ata_port_info uli_port_info = {

	.sht            = &uli_sht,

	.host_flags     = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |

			  ATA_FLAG_NO_LEGACY,

	.host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,

	.pio_mask       = 0x1f,		/* pio0-4 */

	.udma_mask      = 0x7f,		/* udma0-6 */

	.port_ops       = &uli_ops,

drivers/scsi/sata_vsc.c

+5 −3
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ static const struct ata_port_operations vsc_sata_ops = { 
	.exec_command		= ata_exec_command,

	.check_status		= ata_check_status,

	.dev_select		= ata_std_dev_select,

	.phy_reset		= sata_phy_reset,

	.bmdma_setup            = ata_bmdma_setup,

	.bmdma_start            = ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,
@@ -299,7 +298,10 @@ static const struct ata_port_operations vsc_sata_ops = { 
	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_pio_data_xfer,

	.eng_timeout		= ata_eng_timeout,

	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= ata_bmdma_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

	.irq_handler		= vsc_sata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

	.scr_read		= vsc_sata_scr_read,
@@ -394,7 +396,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d 


	probe_ent->sht = &vsc_sata_sht;

	probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				ATA_FLAG_MMIO | ATA_FLAG_SATA_RESET;

				ATA_FLAG_MMIO;

	probe_ent->port_ops = &vsc_sata_ops;

	probe_ent->n_ports = 4;

	probe_ent->irq = pdev->irq;