From patchwork Fri Jan 7 19:22:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anssi Hannula X-Patchwork-Id: 77901 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F0D9AB6F10 for ; Sat, 8 Jan 2011 06:22:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752863Ab1AGTWn (ORCPT ); Fri, 7 Jan 2011 14:22:43 -0500 Received: from saarni.dnainternet.net ([83.102.40.136]:49337 "EHLO saarni.dnainternet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752484Ab1AGTWm (ORCPT ); Fri, 7 Jan 2011 14:22:42 -0500 Received: from localhost (localhost [127.0.0.1]) by saarni.dnainternet.net (Postfix) with ESMTP id ED02AE6DCA; Fri, 7 Jan 2011 21:22:40 +0200 (EET) X-Virus-Scanned: DNA Postiturva at dnainternet.net X-Spam-Flag: NO X-Spam-Score: -1.44 X-Spam-Level: X-Spam-Status: No, score=-1.44 tagged_above=-9999 required=6 tests=[ALL_TRUSTED=-1.44] Received: from saarni.dnainternet.net ([83.102.40.136]) by localhost (saarni.dnainternet.net [127.0.0.1]) (amavisd-new, port 10041) with ESMTP id O8+qTIECUiP1; Fri, 7 Jan 2011 21:22:40 +0200 (EET) Received: from oliivipuu.dnainternet.net (oliivipuu.dnainternet.net [83.102.40.215]) by saarni.dnainternet.net (Postfix) with ESMTP id BB11EE6561; Fri, 7 Jan 2011 21:22:40 +0200 (EET) Received: from mail.onse.fi (unknown [109.204.162.131]) by oliivipuu.dnainternet.net (Postfix) with ESMTP id 8A2E62BB16; Fri, 7 Jan 2011 21:22:36 +0200 (EET) Received: from sigma.onse.fi (sigma [10.0.0.8]) by mail.onse.fi (Postfix) with ESMTP id 38073200C51; Fri, 7 Jan 2011 21:22:36 +0200 (EET) Message-ID: <4D2767FB.5060706@iki.fi> Date: Fri, 07 Jan 2011 21:22:35 +0200 From: Anssi Hannula User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101214 Mandriva/3.1.7-1mdv2011.0 (2011.0) Thunderbird/3.1.7 MIME-Version: 1.0 To: Jeff Garzik CC: Tejun Heo , "linux-ide@vger.kernel.org" , Mark Lord Subject: Re: [PATCH #upstream] ahci: add HFLAG_YES_FBS and apply it to 88SE9128 References: <4C4AFE7C.5070506@kernel.org> <4CF45BC0.2030701@iki.fi> <4CF4FCBE.2060406@kernel.org> <4CF55A4B.1020402@iki.fi> <4CFE8EE2.1060908@iki.fi> <4CFF67B6.7090805@kernel.org> <4CFFC9D0.2090803@garzik.org> <4CFFCAE3.1090106@kernel.org> In-Reply-To: <4CFFCAE3.1090106@kernel.org> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On 08.12.2010 20:13, Tejun Heo wrote: > Hello, Hello! > On 12/08/2010 07:09 PM, Jeff Garzik wrote: >>> I'm not completely comfortable with going ahead with the patch tho. >>> It probably is okay but it's still a shot in the dark. Is there >>> anyone with marvell contact? >> >> I have docs for most Marvell models, but not this one; and no >> contacts... Presumably it is some variant of their existing Marvell >> AHCI line of chips, but beyond that, you and I are both just >> guessing. > > Eh, well, in that case as it's a fix one way or the other, > > Acked-by: Tejun Heo > > Thanks. Ping? This regression fix doesn't seem to be applied in any tree yet. Attached again, just in case. From 5e4e904eb78d69528bc3b3ddd39a55579642bfbd Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Tue, 30 Nov 2010 03:43:15 +0200 Subject: [PATCH] ahci: do not match the IDE interface of 88SE9128 Commit 5f173107ecad83a50 added HFLAG_YES_FBS workaround for 88SE9128 (1b4b:9123). However, that change inadvertently caused the legacy IDE interface of the controller (with the same pci id) to become associated with the AHCI driver as well, causing the driver to try to bring the interface up in vain. Fix that by matching against class as well. Signed-off-by: Anssi Hannula --- drivers/ata/ahci.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 3288263..791cf9b 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -379,6 +379,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv }, /* 6145 */ { PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv }, /* 6121 */ { PCI_DEVICE(0x1b4b, 0x9123), + .class = PCI_CLASS_STORAGE_SATA_AHCI, + .class_mask = 0xffffff, .driver_data = board_ahci_yes_fbs }, /* 88se9128 */ /* Promise */ -- 1.7.3