From patchwork Fri Feb 11 17:36:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Dorchain X-Patchwork-Id: 82793 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 1D4C7B7172 for ; Sat, 12 Feb 2011 04:36:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757264Ab1BKRgX (ORCPT ); Fri, 11 Feb 2011 12:36:23 -0500 Received: from RedStar.dorchain.net ([212.88.133.153]:43040 "EHLO Redstar.dorchain.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757115Ab1BKRgX (ORCPT ); Fri, 11 Feb 2011 12:36:23 -0500 Received: from Redstar.dorchain.net (localhost [127.0.0.1]) by Redstar.dorchain.net (8.14.4/8.14.3) with ESMTP id p1BHaLYR002099 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 11 Feb 2011 18:36:21 +0100 X-DKIM: OpenDKIM Filter v2.1.3 Redstar.dorchain.net p1BHaLYR002099 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dorchain.net; s=redstar; t=1297445781; bh=4FgJhAFz/I69C8fFcsvi6p6uVoLM9GTxjWVYWYiiIpE=; h=Date:From:To:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=FncFvCT8R43TVXC06q9g1sTKjH7RP8je235xW1h/bg0eKlDnp9zifc6YuQDe+bVtx WDQKGJTZCIibNZICJoxXLWtzswa394hQEBaT/Q43sZOfioE1i3goGym8kfj9gGpcIQ PF7ZvZGbOZCumASR9jjzxoSFT0Y/AjsCeijUucQ0= Received: (from joerg@localhost) by Redstar.dorchain.net (8.14.4/8.13.8/Submit) id p1BHaKNk002098 for linux-ide@vger.kernel.org; Fri, 11 Feb 2011 18:36:20 +0100 Date: Fri, 11 Feb 2011 18:36:20 +0100 From: Joerg Dorchain To: linux-ide@vger.kernel.org Subject: Re: [Patch] Enable AHCI on certain ich chipsets Message-ID: <20110211173620.GF5778@Redstar.dorchain.net> References: <20110209115929.GS5778@Redstar.dorchain.net> <4D528F00.1090000@ru.mvista.com> <20110210192321.GB5778@Redstar.dorchain.net> <4D552B18.8030808@ru.mvista.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4D552B18.8030808@ru.mvista.com> X-message-flag: Please send messages in plain text only. Thanks! X-Bindford: 6200 (more Power!) X-Ray: beware User-Agent: Mutt/1.5.20 (2009-06-14) X-Virus-Scanned: clamav-milter 0.96.5 at Redstar X-Virus-Status: Clean Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On Fri, Feb 11, 2011 at 03:27:04PM +0300, Sergei Shtylyov wrote: > >[Several formal corrections] > > >Should be addressed by this try. Thank you for bearing with me. Next try is below. > > >During resume from suspend to ram, the kernel pci layer restores > >the registers for the SATA controller once, then says okay, and > >sets dev->state_saved = false. However, since the restore goes > >from highest address (the BARs [base address registers]) to > >lowest register, some of the higher registers are set as RO > >because according to the lower registers controller is in PIIX > >mode. This patch introduces a workaround for > >this problem, hacking around the PCI API by setting pdev->state_saved = true > >before we do the restore. > > > > This only describes drivers/ata/ahci.c change. Well, the functionality of the patch to quirks.c is described in the comments on the top of it. Should that be repeated? > And looks like it > should be in a patch of its own... I need both parts in order to use the AHCI driver and having suspend/resume work, hence they are together. Bye, Joerg Signed-Off-By: joerg Dorchain --- linux/drivers/pci/quirks.c.orig 2011-02-04 18:29:03.000000000 +0100 +++ linux/drivers/pci/quirks.c 2011-02-11 13:44:12.000000000 +0100 @@ -2684,6 +2684,74 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge); /* + * Force ICH7/8/9 into AHCI mode. This is needed because some + * BIOSes do not make AHCI-mode operation available to the user. + * As the Intel documentation states that the OS should not carry + * out the operation - the user must force this on the kernel + * commandline using quirk_ich_force_ahci + * + * As this quirk gets called whilst the PCI subsystem is + * walking the PCI bus, we declare this quirk against the LPC + * (device 00:1f.0), so that we can frob 00:1f.2 before the PCI + * code has scanned it. + * Note: the pci id might change due to this (e.g. from 27c4 to 27c5) + * + */ + +static bool ich_force_ahci_mode = false; + +static int __init ich789_force_ahci_mode_setup(char *str) +{ + ich_force_ahci_mode = true; + return 0; +} +early_param("quirk_ich_force_ahci", ich789_force_ahci_mode_setup); + +static void ich789_force_ahci_mode(struct pci_dev *pdev) +{ + u8 amrval; + u8 sclkgc; + const int ich89_address_map_reg = 0x90; + const int ich89_sata_clock_gen_config_reg = 0x9c; + + if (!ich_force_ahci_mode) + return; + + /* ICH8 datasheet section 12.1.33 */ + if (!pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(PCI_SLOT(pdev->devfn), 2), + ich89_address_map_reg, &amrval)) { + + if (amrval & (BIT(6) | BIT(7))) { + dev_printk(KERN_DEBUG, &pdev->dev, + "ICH7/8/9 SATA controller not in IDE mode. Not modifying.\n"); + return; + } + if (amrval & (BIT(0) | BIT(1))) + dev_printk(KERN_DEBUG, &pdev->dev, + "ICH7/8/9 in SATA/PATA combined mode. Untested.\n"); + /* AHCI mode */ + amrval |= BIT(6); + amrval &= ~BIT(7); + pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(PCI_SLOT(pdev->devfn), 2), + ich89_sata_clock_gen_config_reg, &sclkgc); + dev_printk(KERN_DEBUG, &pdev->dev, "sclkgc is %#0x\n", sclkgc); + pci_bus_write_config_byte(pdev->bus, PCI_DEVFN(PCI_SLOT(pdev->devfn), 2), + ich89_address_map_reg, amrval); + dev_printk(KERN_DEBUG, &pdev->dev, "Forced ICH7/8/9 mode PIIX->AHCI\n"); + } +} +/* ICH7 */ +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x27b9, ich789_force_ahci_mode); +/* ICH8 */ +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_0, ich789_force_ahci_mode); +/* ICH9R LPC */ +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2916, ich789_force_ahci_mode); +/* ICH9M LPC */ +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2917, ich789_force_ahci_mode); +/* ICH9M-E LPC */ +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2919, ich789_force_ahci_mode); + +/* * This is a quirk for the Ricoh MMC controller found as a part of * some mulifunction chips. --- linux/drivers/ata/ahci.c.orig 2011-02-04 18:13:33.000000000 +0100 +++ linux/drivers/ata/ahci.c 2011-02-11 13:45:22.000000000 +0100 @@ -640,6 +640,11 @@ struct ata_host *host = dev_get_drvdata(&pdev->dev); int rc; + /* + * override check to see if PCI config space is already + * restored in pci_restore_state + */ + pdev->state_saved = true; rc = ata_pci_device_do_resume(pdev); if (rc) return rc;