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

Commit 9ba5aa31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: add missing sht->slave_destroy
  [PATCH] ahci: ignore PORT_IRQ_IF_ERR on JMB controllers
parents c3e59d1e a17259a7

drivers/ata/ahci.c

+22 −5
Original line number Diff line number Diff line
@@ -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_port_info[] = { 
		.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_pci_tbl[] = { 
	{ 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_port *ap, u32 irq_stat) 
	/* 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
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static struct scsi_host_template generic_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_ali.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ static struct scsi_host_template artop_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,

};