Attachment 104056 Details for Bug 205331

[patch] ich6m map 01b fix

patch (text/plain), 2.22 KB, created by tejun heo on 2006-11-07 01:38:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tejun heo

Created: 2006-11-07 01:38:30 UTC

Size: 2.22 KB

patch

obsolete

>diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
>index a9bb3cb..986c358 100644
>--- a/drivers/scsi/ata_piix.c
>+++ b/drivers/scsi/ata_piix.c
>@@ -123,8 +123,7 @@ enum {
> 	ich6_sata		= 4,
> 	ich6_sata_ahci		= 5,
> 	ich6m_sata_ahci		= 6,
>-	ich7m_sata_ahci		= 7,
>-	ich8_sata_ahci		= 8,
>+	ich8_sata_ahci		= 7,
> 
> 	/* constants for mapping table */
> 	P0			= 0,  /* port 0 */
>@@ -189,7 +188,7 @@ #endif
> 	/* 82801GB/GR/GH (ICH7, identical to ICH6) */
> 	{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
> 	/* 2801GBM/GHM (ICH7M, identical to ICH6M) */
>-	{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7m_sata_ahci },
>+	{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata_ahci },
> 	/* Enterprise Southbridge 2 (where's the datasheet?) */
> 	{ 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
> 	/* SATA Controller 1 IDE (ICH8, no datasheet yet) */
>@@ -328,23 +327,10 @@ static const struct piix_map_db ich6m_ma
> 	.mask = 0x3,
> 	.port_enable = 0x5,
> 	.present_shift = 4,
>-	.map = {
>-		/* PM   PS   SM   SS       MAP */
>-		{  P0,  P2,  RV,  RV }, /* 00b */
>-		{  RV,  RV,  RV,  RV },
>-		{  P0,  P2, IDE, IDE }, /* 10b */
>-		{  RV,  RV,  RV,  RV },
>-	},
>-};
>-
>-static const struct piix_map_db ich7m_map_db = {
>-	.mask = 0x3,
>-	.port_enable = 0x5,
>-	.present_shift = 4,
> 
> 	/* Map 01b isn't specified in the doc but some notebooks use
>-	 * it anyway.  ATM, the only case spotted carries subsystem ID
>-	 * 1025:0107.  This is the only difference from ich6m.
>+	 * it anyway.  MAP 01b have been spotted on both ICH6M and
>+	 * ICH7M.
> 	 */
> 	.map = {
> 		/* PM   PS   SM   SS       MAP */
>@@ -374,7 +360,6 @@ static const struct piix_map_db *piix_ma
> 	[ich6_sata]		= &ich6_map_db,
> 	[ich6_sata_ahci]	= &ich6_map_db,
> 	[ich6m_sata_ahci]	= &ich6m_map_db,
>-	[ich7m_sata_ahci]	= &ich7m_map_db,
> 	[ich8_sata_ahci]	= &ich8_map_db,
> };
> 
>@@ -464,18 +449,6 @@ #endif
> 		.port_ops	= &piix_sata_ops,
> 	},
> 
>-	/* ich7m_sata_ahci */
>-	{
>-		.sht		= &piix_sht,
>-		.host_flags	= ATA_FLAG_SATA |
>-				  PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR |
>-				  PIIX_FLAG_AHCI,
>-		.pio_mask	= 0x1f,	/* pio0-4 */
>-		.mwdma_mask	= 0x07, /* mwdma0-2 */
>-		.udma_mask	= 0x7f,	/* udma0-6 */
>-		.port_ops	= &piix_sata_ops,
>-	},
>-
> 	/* ich8_sata_ahci */
> 	{
> 		.sht		= &piix_sht,

Actions: View | Diff

Attachments on bug 205331: 98535 | 98536 | 99878 | 103922 | 104035 | 104040 | 104056 | 104207 | 104388 | 104802 | 105250 | 106953 | 107752