From patchwork Wed Dec 16 15:16:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 7862431 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 ABBA59F1C2 for ; Wed, 16 Dec 2015 15:19:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A70AC20148 for ; Wed, 16 Dec 2015 15:19:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC0652035E for ; Wed, 16 Dec 2015 15:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965774AbbLPPTm (ORCPT ); Wed, 16 Dec 2015 10:19:42 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38874 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965854AbbLPPSO (ORCPT ); Wed, 16 Dec 2015 10:18:14 -0500 Received: by mail-wm0-f42.google.com with SMTP id l126so42584195wml.1 for ; Wed, 16 Dec 2015 07:18:14 -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=Qa/kQCZjH1BxAQ8EmF98Fbe5AX4p1nBi/i8pjKBjs7A=; b=1TEioWtWm4QsG0Wu8Nk9f/n+wd94LIEU95qKX50nvzI8q3hZFFEbEcASzzQGf5+KAZ aT7Tj2kP8K39aaQYsU6+tBR0hyNJoLWVr31B5JMjaNaiS//sg4QLpix17+joiK/8zeZm rA9GioEDYT28VmhYilDbT3CF50FMJBHY/tiSrkTr4RiWe+nCDOXYKcubclrTrjVg2PyI aOEA/pMS+kjgGJyTVZ+SNb/qnyKWtZFE9F+N3FQK7tIzrnB+6SEdD/3YfYV2S7xEKPGH jpiQa22PfyR4QO+YGdACfR3HC29IazBVFpLd/R3Xoyp6An0Y4HqHj2lV3/be8GUQnPXq WsBw== 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=Qa/kQCZjH1BxAQ8EmF98Fbe5AX4p1nBi/i8pjKBjs7A=; b=evxIiPtqDWPoPHpoQBuzqXmyg+UW1KaCK4Wn5PHpseZh5OuUUsROVjXfeU9PI4/25I ZDE94t5ZxlpLAgHgy+bUmy8zK2Dp0jI5+W/3M9DkEPLZT5FxXbWiRxnQm4XqLCkYQxAY tjnx8VqbWly0aUFJQDxxT+PvnkCZ6hzMZPvf4F9o9CsxOPaVPJgHU/uzWvTFhBGib3j6 O07lid1zPwqTmn6EQj6kq6yTi0U2nsXBo4HLLPItMe2iiHcPDUwYs+2svNRXFQVBazmK 3qOdTqP0PrOARWrJf38j9sgYIbACHKVGwmZicxDdwih276NI5NAbvIYwvZQmPAlj4esc SKbQ== X-Gm-Message-State: ALoCoQmzYECnFeK9O0GTrH9gc2g5RQdAq3XLBTupYCRkDbSTvQ6SA7t5K/QJ4EgE5OXaq+oQ0wVkNeHhIsDr4uz9x12oV8oP3Q== X-Received: by 10.28.138.6 with SMTP id m6mr12470435wmd.82.1450279093677; Wed, 16 Dec 2015 07:18:13 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 07:18:13 -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 19/23] acpi, mcfg: Add default PCI config accessors implementation and initial support for related quirks. Date: Wed, 16 Dec 2015 16:16:29 +0100 Message-Id: <1450278993-12664-20-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=ham 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 We use generic accessors from access.c by default. However, we already know platforms that need special handling while accessing to PCI config space. These platforms will need different accessors set matched against platform ID, domain, bus touple. Therefore we are going to add (in future) DECLARE_ACPI_MCFG_FIXUP which will register platform specific custom accessors. For now we let pci_mcfg_get_ops takes domain and bus arguments and left some space for matching algorithm. Signed-off-by: Tomasz Nowicki --- drivers/acpi/mcfg.c | 30 ++++++++++++++++++++++++++++++ include/linux/pci-acpi.h | 8 ++++++++ 2 files changed, 38 insertions(+) diff --git a/drivers/acpi/mcfg.c b/drivers/acpi/mcfg.c index dca4c4e..a9b2231 100644 --- a/drivers/acpi/mcfg.c +++ b/drivers/acpi/mcfg.c @@ -34,6 +34,36 @@ int __weak raw_pci_write(unsigned int domain, unsigned int bus, return PCIBIOS_DEVICE_NOT_FOUND; } +void __iomem * +pci_mcfg_dev_base(struct pci_bus *bus, unsigned int devfn, int offset) +{ + struct pci_mmcfg_region *cfg; + + cfg = pci_mmconfig_lookup(pci_domain_nr(bus), bus->number); + if (cfg && cfg->virt) + return cfg->virt + + (PCI_MMCFG_BUS_OFFSET(bus->number) | (devfn << 12)) + + offset; + return NULL; +} + +/* Default generic PCI config accessors */ +static struct pci_ops default_pci_mcfg_ops = { + .map_bus = pci_mcfg_dev_base, + .read = pci_generic_config_read, + .write = pci_generic_config_write, +}; + +struct pci_ops *pci_mcfg_get_ops(int domain, int bus) +{ + /* + * TODO: Match against platform specific quirks and return + * corresponding PCI config space accessor set. + */ + + return &default_pci_mcfg_ops; +} + int __init acpi_parse_mcfg(struct acpi_table_header *header) { struct acpi_table_mcfg *mcfg; diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index c277415..3790197 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -82,10 +82,18 @@ 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); +struct pci_ops *pci_mcfg_get_ops(int domain, int bus); +void __iomem * +pci_mcfg_dev_base(struct pci_bus *bus, unsigned int devfn, int offset); #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) { } +static inline struct pci_ops *pci_mcfg_get_ops(int domain, int bus) +{ return NULL; } +void __iomem * +pci_mcfg_dev_base(struct pci_bus *bus, unsigned int devfn, int offset) +{ return NULL; } #endif #ifdef CONFIG_ACPI_PCI_SLOT