From patchwork Mon Sep 13 23:16:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 176192 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8DNH1pT031060 for ; Mon, 13 Sep 2010 23:17:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752010Ab0IMXQ5 (ORCPT ); Mon, 13 Sep 2010 19:16:57 -0400 Received: from g1t0027.austin.hp.com ([15.216.28.34]:34617 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751696Ab0IMXQ5 (ORCPT ); Mon, 13 Sep 2010 19:16:57 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0027.austin.hp.com (Postfix) with ESMTP id 12257382DB; Mon, 13 Sep 2010 23:16:56 +0000 (UTC) Received: from ldl.fc.hp.com (lart.fc.hp.com [15.11.146.31]) by g1t0038.austin.hp.com (Postfix) with ESMTP id DB5FD30030; Mon, 13 Sep 2010 23:16:55 +0000 (UTC) From: Bjorn Helgaas To: "Simon Arlott" Subject: Re: GA-MA69VM-S2 requires pci=nocrs with 2.6.35.4 Date: Mon, 13 Sep 2010 17:16:15 -0600 User-Agent: KMail/1.13.2 (Linux/2.6.32-24-generic; KDE/4.4.2; x86_64; ; ) Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, Jordan Crouse References: In-Reply-To: MIME-Version: 1.0 Message-Id: <201009131716.18197.bjorn.helgaas@hp.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 13 Sep 2010 23:17:01 +0000 (UTC) diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index 6dd8955..f793efd 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -510,6 +510,7 @@ static void sb600_disable_hpet_bar(struct pci_dev *dev) */ pci_read_config_byte(dev, 0x08, &val); + dev_info(&dev->dev, "read %#02x\n", val); if (val < 0x2F) { outb(0x55, 0xCD6); @@ -517,7 +518,9 @@ static void sb600_disable_hpet_bar(struct pci_dev *dev) /* Set bit 7 in PM register 0x55 */ outb(0x55, 0xCD6); - outb(val | 0x80, 0xCD7); + outb(val | 0x7f, 0xCD7); + dev_info(&dev->dev, "disabled BAR 1 (%pR)\n", + &dev->resource[1]); } } DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, 0x4385, sb600_disable_hpet_bar);