Re: ata_piix on MacBook4,1: fail to startup in a certain situation

[Tejun Heo <htejun@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

MATSUBAYASHI 'Shaolin' Kohji wrote:
> Unfortunately no...
> With this patch, booting will stop during the execution of
> the following lines (in ata_piix.c: piix_init_sidpr()):
> 
>         if (pci_resource_start(pdev, PIIX_SIDPR_BAR) == 0 ||
>             pci_resource_len(pdev, PIIX_SIDPR_BAR) != PIIX_SIDPR_LEN)
>                 return;
> 
> which might suggest this is not ata_piix related problem I'm afraid...
> 
> Again, please note if I keep the AC adapter plugged to MacBook,
> there is no such problem happening. It happens only when running with battery.

Hmmm.. That really doesn't make much sense.  Can you please try the
attached one just in case?

Thanks.

-- 
tejun

[-- Attachment #2: ata_piix-apple-1.patch --]
[-- Type: text/x-patch, Size: 867 bytes --]

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index a9027b8..6c2e907 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -251,6 +251,7 @@ static const struct pci_device_id piix_pci_tbl[] = {
 	{ 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
 	/* Mobile SATA Controller IDE (ICH8M), Apple */
 	{ 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata },
+	{ 0x8086, 0x2828, 0x106b, 0x00a1, 0, 0, ich8m_apple_sata },
 	/* SATA Controller IDE (ICH9) */
 	{ 0x8086, 0x2920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
 	/* SATA Controller IDE (ICH9) */
@@ -526,7 +527,7 @@ static struct ata_port_info piix_port_info[] = {
 
 	[ich8m_apple_sata] =
 	{
-		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR,
+		.flags		= PIIX_SATA_FLAGS,
 		.pio_mask	= 0x1f,	/* pio0-4 */
 		.mwdma_mask	= 0x07, /* mwdma0-2 */
 		.udma_mask	= ATA_UDMA6,