From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760615AbYCYXx6 (ORCPT ); Tue, 25 Mar 2008 19:53:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757667AbYCYXxu (ORCPT ); Tue, 25 Mar 2008 19:53:50 -0400 Received: from ozlabs.org ([203.10.76.45]:51561 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755869AbYCYXxt (ORCPT ); Tue, 25 Mar 2008 19:53:49 -0400 To: CC: Linux IDE , From: Benjamin Herrenschmidt Date: Wed, 26 Mar 2008 10:50:41 +1100 Subject: [PATCH] pata_sil680: Only enable MMIO on Cell blades Message-Id: <20080325235112.C29CDDE1D9@ozlabs.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There have been reported regressions of the SIL 680 driver when using MMIO, so this makes it only try MMIO on Cell blades where it's known to be necessary (the host bridge doesn't do PIO on these). We'll try to find the root problem with MMIO separately. Signed-off-by: Benjamin Herrenschmidt --- drivers/ata/pata_sil680.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- linux-work.orig/drivers/ata/pata_sil680.c 2008-03-26 10:43:20.000000000 +1100 +++ linux-work/drivers/ata/pata_sil680.c 2008-03-26 10:43:34.000000000 +1100 @@ -269,7 +269,11 @@ static u8 sil680_init_chip(struct pci_de dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n", tmpbyte & 1, tmpbyte & 0x30); - *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); + *try_mmio = 0; +#ifdef CONFIG_PPC + if (machine_is(cell)) + *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); +#endif switch(tmpbyte & 0x30) { case 0x00: