From patchwork Sat Feb 9 00:26:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 2119221 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 61B8A3FCA4 for ; Sat, 9 Feb 2013 00:28:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947527Ab3BIA10 (ORCPT ); Fri, 8 Feb 2013 19:27:26 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:35691 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947333Ab3BIA1Z (ORCPT ); Fri, 8 Feb 2013 19:27:25 -0500 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r190R973003725 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 9 Feb 2013 00:27:09 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r190R8Ub008258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 9 Feb 2013 00:27:09 GMT Received: from abhmt114.oracle.com (abhmt114.oracle.com [141.146.116.66]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r190R8IW015438; Fri, 8 Feb 2013 18:27:08 -0600 Received: from linux-siqj.site (/10.132.127.230) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 08 Feb 2013 16:27:08 -0800 From: Yinghai Lu To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Bjorn Helgaas , "Rafael J. Wysocki" Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v2 26-4/26] PCI, x86, ACPI: get ioapic address from acpi device Date: Fri, 8 Feb 2013 16:26:46 -0800 Message-Id: <1360369606-8416-4-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360369606-8416-1-git-send-email-yinghai@kernel.org> References: <1360369606-8416-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 Some ioapic controller does not show up on pci config space, or pci device is there but no bar is used and is set by firmare in other place. We need to get ioapic address from ACPI0009's _CRS. Signed-off-by: Yinghai Lu --- drivers/pci/ioapic.c | 92 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 18 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/pci/ioapic.c =================================================================== --- linux-2.6.orig/drivers/pci/ioapic.c +++ linux-2.6/drivers/pci/ioapic.c @@ -32,6 +32,36 @@ struct acpi_pci_ioapic { static LIST_HEAD(ioapic_list); static DEFINE_MUTEX(ioapic_list_lock); +static acpi_status setup_res(struct acpi_resource *acpi_res, void *data) +{ + struct resource *res; + struct acpi_resource_address64 addr; + acpi_status status; + unsigned long flags; + u64 start, end; + + status = acpi_resource_to_address64(acpi_res, &addr); + if (!ACPI_SUCCESS(status)) + return AE_OK; + + if (addr.resource_type == ACPI_MEMORY_RANGE) { + if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY) + return AE_OK; + flags = IORESOURCE_MEM; + } else + return AE_OK; + + start = addr.minimum + addr.translation_offset; + end = addr.maximum + addr.translation_offset; + + res = data; + res->flags = flags; + res->start = start; + res->end = end; + + return AE_OK; +} + static void handle_ioapic_add(acpi_handle handle, struct pci_dev **pdev, u32 *pgsi_base) { @@ -54,33 +84,56 @@ static void handle_ioapic_add(acpi_handl return; dev = acpi_get_pci_dev(handle); - if (!dev) - return; + if (!dev || !pci_resource_len(dev, 0)) { + struct acpi_device_info *info; + char *hid = NULL; + + status = acpi_get_object_info(handle, &info); + if (ACPI_FAILURE(status)) + goto exit_put; + if (info->valid & ACPI_VALID_HID) + hid = info->hardware_id.string; + if (!hid || strcmp(hid, "ACPI0009")) { + kfree(info); + goto exit_put; + } + kfree(info); + memset(res, 0, sizeof(*res)); + acpi_walk_resources(handle, METHOD_NAME__CRS, setup_res, res); + if (!res->flags) + goto exit_put; + } acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); gsi_base = gsb; type = "IOxAPIC"; + if (dev) { + ret = pci_enable_device(dev); + if (ret < 0) + goto exit_put; + + pci_set_master(dev); + + if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC) + type = "IOAPIC"; + + if (pci_resource_len(dev, 0)) { + if (pci_request_region(dev, 0, type)) + goto exit_disable; - ret = pci_enable_device(dev); - if (ret < 0) - goto exit_put; - - pci_set_master(dev); - - if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC) - type = "IOAPIC"; - - if (pci_request_region(dev, 0, type)) - goto exit_disable; - - res = &dev->resource[0]; + res = &dev->resource[0]; + } + } - if (acpi_register_ioapic(handle, res->start, gsi_base)) - goto exit_release; + if (acpi_register_ioapic(handle, res->start, gsi_base)) { + if (dev) + goto exit_release; + return; + } pr_info("%s %s %s at %pR, GSI %u\n", - dev_name(&dev->dev), objname, type, + dev ? dev_name(&dev->dev) : "", objname, type, res, gsi_base); *pdev = dev; @@ -111,6 +164,9 @@ static void handle_ioapic_remove(acpi_ha { acpi_unregister_ioapic(handle, gsi_base); + if (!dev) + return; + pci_release_region(dev, 0); pci_disable_device(dev); /* need to disable it, otherwise remove/rescan will not work */