From patchwork Wed Dec 16 15:16:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 7862561 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CEDD59F1C2 for ; Wed, 16 Dec 2015 15:21:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED36B20382 for ; Wed, 16 Dec 2015 15:21:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2AD62035E for ; Wed, 16 Dec 2015 15:21:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965452AbbLPPUr (ORCPT ); Wed, 16 Dec 2015 10:20:47 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:33503 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965826AbbLPPSL (ORCPT ); Wed, 16 Dec 2015 10:18:11 -0500 Received: by mail-wm0-f44.google.com with SMTP id p187so5711785wmp.0 for ; Wed, 16 Dec 2015 07:18:10 -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=NZ78mNMyHK3n2S5qUqbW9Alr1syr2Lq8acqDUkpCaNMI63ZFZNj3is1UoVs6CfOG4H nHl9d2XC2oVs3F1qdabvCncQAWiJ5o8RX1YArnqg1qcDXouEUfC+MW3k+yNn5uM+6Lk1 58jvJEvbE3k5JICsBW7fiKOKoxM3c4ZqL+qaSE4QCG2aR7msNIynl7j4sTECbfMOYQSV vegJGGg5oP+ax1Dpq9mG7i9E9zmqf0T58ixaZCAOgPHTKEiGnylzAoIci72bpnME2d27 fwJvv12hiJisXXvQhqWKz5LPbB9LneI0UXZsE4adlpOuz4vUeCPkdgxOvQP9vn6dLxOq BUBA== 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=TGgZAVzEcZryPNyvuG5bbSbfdYrztYvQnQOq2ZAn8oJF11sNMqEAOmGsPIQR13seTY IefZrLH/OYz28ceZDPhIFe6j4d7dZHZSuCWXmfyk94z5V1AC2hCircl6SDrhFy0YetQB 1qgM9vOP96wgfZgVfs8rOAdvCPvfLPoG0TycMaGcYJBgQoM3ElnUmJPvP2s9KjrToHhA OdKFoaH62HAiU4xu7yx/QPHCTKheEjCYNl5KWYSEkxA2HVzkUTWLzY+Wvt3f08VGpgJw b4Fo+kbXyZftVesBklsKObaCP9m4T1fe6s/Eh49H+IIdWrfSpoTs73+Tc5HqhJpq3RR9 Hagg== X-Gm-Message-State: ALoCoQkA9+NkO0HeEVuHDpE2Y0YDtiOuOcOOHqjdutmBWl+Ga8gG7EuVq/Ikt5Hjm1HlBL5hPn5/C6sluhYRP4R8Wh/SGTy4cQ== X-Received: by 10.194.75.202 with SMTP id e10mr57249659wjw.160.1450279090027; Wed, 16 Dec 2015 07:18:10 -0800 (PST) Received: from tn-HP-4.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id z17sm6438761wjq.1.2015.12.16.07.18.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 07:18:09 -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 V2 17/23] acpi, mcfg: Implement two calls that might be used to inject/remove MCFG region. Date: Wed, 16 Dec 2015 16:16:27 +0100 Message-Id: <1450278993-12664-18-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450278993-12664-1-git-send-email-tn@semihalf.com> References: <1450278993-12664-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,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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);