Attachment 154649 Details for Bug 240027 – RHEL4.6: fix for this issue

[patch] RHEL4.6: fix for this issue

240027.patch (text/plain), 1.90 KB, created by Prarit Bhargava on 2007-05-14 14:51:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2007-05-14 14:51:55 UTC

Size: 1.90 KB

patch

obsolete

>--- linux-2.6.9.orig/drivers/ata/ahci.c	2007-05-14 08:41:18.000000000 -0400
>+++ linux-2.6.9/drivers/ata/ahci.c	2007-05-14 09:34:26.000000000 -0400
>@@ -81,6 +81,7 @@ enum {
> 	board_ahci_pi		= 1,
> 	board_ahci_vt8251	= 2,
> 	board_ahci_ign_iferr	= 3,
>+	board_ahci_sb600	= 4,
> 
> 	/* global controller registers */
> 	HOST_CAP		= 0x00, /* host capabilities */
>@@ -172,6 +173,7 @@ enum {
> 	AHCI_FLAG_NO_NCQ		= (1 << 24),
> 	AHCI_FLAG_IGN_IRQ_IF_ERR	= (1 << 25), /* ignore IRQ_IF_ERR */
> 	AHCI_FLAG_HONOR_PI		= (1 << 26), /* honor PORTS_IMPL */
>+	AHCI_FLAG_IGN_SERR_INTERNAL	= (1 << 27), /* ignore SERR_INTERNAL */
> };
> 
> struct ahci_cmd_hdr {
>@@ -351,6 +353,18 @@ static const struct ata_port_info ahci_p
> 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
> 		.port_ops	= &ahci_ops,
> 	},
>+	/* board_ahci_sb600 */
>+	{
>+		.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_SERR_INTERNAL,
>+		.pio_mask	= 0x1f, /* pio0-4 */
>+		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
>+		.port_ops	= &ahci_ops,
>+	},
>+
> };
> 
> static const struct pci_device_id ahci_pci_tbl[] = {
>@@ -391,7 +405,7 @@ static const struct pci_device_id ahci_p
> 	{ PCI_VDEVICE(JMICRON, 0x2366), board_ahci_ign_iferr }, /* JMB366 */
> 
> 	/* ATI */
>-	{ PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
>+	{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 non-raid */
> 	{ PCI_VDEVICE(ATI, 0x4381), board_ahci }, /* ATI SB600 raid */
> 
> 	/* VIA */
>@@ -1076,8 +1090,11 @@ static void ahci_error_intr(struct ata_p
> 	if (ap->flags & AHCI_FLAG_IGN_IRQ_IF_ERR)
> 		irq_stat &= ~PORT_IRQ_IF_ERR;
> 
>-	if (irq_stat & PORT_IRQ_TF_ERR)
>+	if (irq_stat & PORT_IRQ_TF_ERR) {
> 		err_mask |= AC_ERR_DEV;
>+		if (ap->flags & AHCI_FLAG_IGN_SERR_INTERNAL)
>+			serror &= ~SERR_INTERNAL;
>+	}
> 
> 	if (irq_stat & (PORT_IRQ_HBUS_ERR | PORT_IRQ_HBUS_DATA_ERR)) {
> 		err_mask |= AC_ERR_HOST_BUS;

Actions: View | Diff

Attachments on bug 240027: 154649