From patchwork Fri Apr 12 22:44:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 2438351 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 823D040060 for ; Fri, 12 Apr 2013 22:46:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755548Ab3DLWpb (ORCPT ); Fri, 12 Apr 2013 18:45:31 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:47280 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755334Ab3DLWpZ (ORCPT ); Fri, 12 Apr 2013 18:45:25 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r3CMj1hm000408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 12 Apr 2013 22:45:02 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r3CMj0Ra023108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 12 Apr 2013 22:45:01 GMT Received: from abhmt115.oracle.com (abhmt115.oracle.com [141.146.116.67]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r3CMix1D024266; Fri, 12 Apr 2013 22:44:59 GMT Received: from linux-siqj.site (/10.132.126.191) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 12 Apr 2013 15:44:59 -0700 From: Yinghai Lu To: Bjorn Helgaas , Ram Pai Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v4 27/29] PCI: Make piix4 quirk to use addon_res Date: Fri, 12 Apr 2013 15:44:41 -0700 Message-Id: <1365806683-26717-28-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365806683-26717-1-git-send-email-yinghai@kernel.org> References: <1365806683-26717-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org After they are put in add-on resources, they will be safely claimed later. Signed-off-by: Yinghai Lu --- drivers/pci/quirks.c | 95 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 79 insertions(+), 16 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 2dac170..6706182 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -382,14 +382,14 @@ static void quirk_ali7101_acpi(struct pci_dev *dev) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, quirk_ali7101_acpi); -static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int port, unsigned int enable) +static int piix4_read_io(struct pci_dev *dev, struct resource *res, int port) { u32 devres; u32 mask, size, base; + struct pci_bus_region bus_region; pci_read_config_dword(dev, port, &devres); - if ((devres & enable) != enable) - return; + mask = (devres >> 16) & 15; base = devres & 0xffff; size = 16; @@ -399,23 +399,54 @@ static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int p break; size = bit; } - /* - * For now we only print it out. Eventually we'll want to - * reserve it (at least if it's in the 0x1000+ range), but - * let's get enough confirmation reports first. - */ base &= -size; - dev_info(&dev->dev, "%s PIO at %04x-%04x\n", name, base, base + size - 1); + + bus_region.start = base; + bus_region.end = base + size - 1; + res->flags |= IORESOURCE_IO; + pcibios_bus_to_resource(dev, res, &bus_region); + dev_info(&dev->dev, "PIO at %pR\n", res); + + return 0; } +static int piix4_write_io(struct pci_dev *dev, struct resource *res, int port) +{ + u32 devres; + struct pci_bus_region bus_region; + unsigned size = to_pci_dev_addon_resource(res)->size; -static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int port, unsigned int enable) + pcibios_resource_to_bus(dev, &bus_region, res); + + pci_read_config_dword(dev, port, &devres); + devres &= 0xffff0000 | (size - 1); + devres |= bus_region.start & 0xffff & (~(size - 1)); + pci_write_config_dword(dev, port, devres); + + return 0; +} +static struct resource_ops piix4_io_ops = { + .read = piix4_read_io, + .write = piix4_write_io, +}; +static void piix4_io_quirk(struct pci_dev *dev, char *name, unsigned int port, + unsigned int enable) { u32 devres; - u32 mask, size, base; pci_read_config_dword(dev, port, &devres); if ((devres & enable) != enable) return; + + pci_add_dev_addon_resource(dev, port, 0, &piix4_io_ops, name); +} + +static int piix4_read_mem(struct pci_dev *dev, struct resource *res, int port) +{ + u32 devres; + u32 mask, size, base; + struct pci_bus_region bus_region; + + pci_read_config_dword(dev, port, &devres); base = devres & 0xffff0000; mask = (devres & 0x3f) << 16; size = 128 << 16; @@ -425,12 +456,44 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int break; size = bit; } - /* - * For now we only print it out. Eventually we'll want to - * reserve it, but let's get enough confirmation reports first. - */ base &= -size; - dev_info(&dev->dev, "%s MMIO at %04x-%04x\n", name, base, base + size - 1); + bus_region.start = base; + bus_region.end = base + size - 1; + res->flags |= IORESOURCE_MEM; + pcibios_bus_to_resource(dev, res, &bus_region); + dev_info(&dev->dev, "MMIO at %pR\n", res); + + return 0; +} +static int piix4_write_mem(struct pci_dev *dev, struct resource *res, int port) +{ + u32 devres; + struct pci_bus_region bus_region; + unsigned size = to_pci_dev_addon_resource(res)->size; + + pcibios_resource_to_bus(dev, &bus_region, res); + + pci_read_config_dword(dev, port, &devres); + devres &= 0x0000ffff | ((size - 1) & 0xffff0000); + devres |= bus_region.start & 0xffff0000 & (~(size - 1)); + pci_write_config_dword(dev, port, devres); + + return 0; +} +static struct resource_ops piix4_mem_ops = { + .read = piix4_read_mem, + .write = piix4_write_mem, +}; +static void piix4_mem_quirk(struct pci_dev *dev, char *name, unsigned int port, + unsigned int enable) +{ + u32 devres; + + pci_read_config_dword(dev, port, &devres); + if ((devres & enable) != enable) + return; + + pci_add_dev_addon_resource(dev, port, 0, &piix4_mem_ops, name); } /*