From patchwork Wed Jan 13 13:21:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 8025001 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 96DF5BEEE5 for ; Wed, 13 Jan 2016 13:24:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5B0720498 for ; Wed, 13 Jan 2016 13:24:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E9952049D for ; Wed, 13 Jan 2016 13:24:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753900AbcAMNYV (ORCPT ); Wed, 13 Jan 2016 08:24:21 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:36283 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933201AbcAMNVs (ORCPT ); Wed, 13 Jan 2016 08:21:48 -0500 Received: by mail-wm0-f48.google.com with SMTP id l65so293168372wmf.1 for ; Wed, 13 Jan 2016 05:21:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hFmgiLOR2iir/bn5Yh+XvlgG9gvfl4dJ2JxQj2qsfN0=; b=HzZF5LY2I2rG6eYApav1/NoVKDqpsjndd5KK0xm5Bts01XqF+exLOsZ2D2p1nMPOM2 okmveCjhDNi+Y0v1OkQ8dBZ+mVN/EdJ9j4L3vuzMK+L/vurtGibECLXuINIjWdlHbR08 vLBNzPbDZm1vngKgZZzORQ8y/hgHcpUw6iM7wulTD6Js2KYYGQLgsZAAM6bKO4d6L5KD 4v/tWVzoyntPuCqv/WjHGPcbEj9yhkvbh374DbPkttf8Xu4oFwfE7c0W3xarssQHChuL rIKbbZFnCt5nvOk9xfhw2Ts5vRQQVEKSZUwlGdvFwQsOUwp7FhrJEkjakmMjpHUCVxrs /g9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hFmgiLOR2iir/bn5Yh+XvlgG9gvfl4dJ2JxQj2qsfN0=; b=lUm06VBrI9OBVUor0C+3oE9A7DDSwaLF7deoI+PmiXTbuQtp9pkVkpqNnpz3vMNlv5 r4iidcKVBlYVIqUP8gweT7FwUsM2JIZV4beX4F/R7u5jyiKMGpjgyJZ4YwmPuNSYupSU /h2MQ1yUIFlmz/6RHQbJ/alm7qGCQM2iiqAOmsyCPkL3ybVURTOf6pdeWyfCKlBz+x75 +Qd3+E2HHOFCLARLih1r/LXf7vGw5T6X2w0UAF+KzcOEBNdiE3Q8GCZLeZAC7w2b3Toc 6jaO16TX2ME1sr3uo8aWHDqrxN1iUS1LaTJ9G6K7cnshx1ERkCcG4ZxZgDWeOy2xFE0X 9l4A== X-Gm-Message-State: ALoCoQmEW/spzg5Jguuw8iyimYRmyPDCDZb3I2mm3Hpz7EaRLce0ek/o2/BpQ+nSDDwJ7ee1kSemcN1Lf8divENYKSub6V/lYw== X-Received: by 10.194.246.134 with SMTP id xw6mr29590248wjc.158.1452691307352; Wed, 13 Jan 2016 05:21:47 -0800 (PST) Received: from tn-HP-4.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id y124sm8858741wmg.3.2016.01.13.05.21.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jan 2016 05:21:46 -0800 (PST) From: Tomasz Nowicki To: bhelgaas@google.com, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, okaya@codeaurora.org, jiang.liu@linux.intel.com, Stefano.Stabellini@eu.citrix.com Cc: robert.richter@caviumnetworks.com, mw@semihalf.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, tglx@linutronix.de, wangyijing@huawei.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, jchandra@broadcom.com, jcm@redhat.com, Tomasz Nowicki Subject: [PATCH V3 15/21] acpi, mcfg: Implement two calls that might be used to inject/remove MCFG region. Date: Wed, 13 Jan 2016 14:21:01 +0100 Message-Id: <1452691267-32240-16-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452691267-32240-1-git-send-email-tn@semihalf.com> References: <1452691267-32240-1-git-send-email-tn@semihalf.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Lets abstract two calls which allow to inject and remove MCFG regions which may come from DSDT table. These calls will be used for x86 and ARM64 PCI host bridge driver in the later patches. Signed-off-by: Tomasz Nowicki --- drivers/acpi/mcfg.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/pci-acpi.h | 9 +++++++++ 2 files changed, 47 insertions(+) diff --git a/drivers/acpi/mcfg.c b/drivers/acpi/mcfg.c index 3e1e7be..dca4c4e 100644 --- a/drivers/acpi/mcfg.c +++ b/drivers/acpi/mcfg.c @@ -10,6 +10,7 @@ #include #include #include +#include #define PREFIX "MCFG: " @@ -77,6 +78,43 @@ int __init acpi_parse_mcfg(struct acpi_table_header *header) return 0; } +int pci_mmcfg_setup_map(struct acpi_pci_root_info *ci) +{ + struct pci_mmcfg_region *cfg; + struct acpi_pci_root *root; + int seg, start, end, err; + + root = ci->root; + seg = root->segment; + start = root->secondary.start; + end = root->secondary.end; + + cfg = pci_mmconfig_lookup(seg, start); + if (cfg) + return 0; + + cfg = pci_mmconfig_alloc(seg, start, end, root->mcfg_addr); + if (!cfg) + return -ENOMEM; + + err = pci_mmconfig_inject(cfg); + return err; +} + +void pci_mmcfg_teardown_map(struct acpi_pci_root_info *ci) +{ + struct acpi_pci_root *root = ci->root; + struct pci_mmcfg_region *cfg; + + cfg = pci_mmconfig_lookup(root->segment, root->secondary.start); + if (!cfg) + return; + + if (cfg->hot_added) + pci_mmconfig_delete(root->segment, root->secondary.start, + root->secondary.end); +} + int __init __weak acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg, struct acpi_mcfg_allocation *cfg) { diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 89ab057..c277415 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -79,6 +79,15 @@ extern struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, void acpi_pci_add_bus(struct pci_bus *bus); void acpi_pci_remove_bus(struct pci_bus *bus); +#ifdef CONFIG_PCI_MMCONFIG +int pci_mmcfg_setup_map(struct acpi_pci_root_info *ci); +void pci_mmcfg_teardown_map(struct acpi_pci_root_info *ci); +#else +static inline int pci_mmcfg_setup_map(struct acpi_pci_root_info *ci) +{ return 0; } +static inline void pci_mmcfg_teardown_map(struct acpi_pci_root_info *ci) { } +#endif + #ifdef CONFIG_ACPI_PCI_SLOT void acpi_pci_slot_init(void); void acpi_pci_slot_enumerate(struct pci_bus *bus);