From patchwork Thu Feb 4 17:28:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 579050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 15C7A1409B7 for ; Fri, 5 Feb 2016 04:32:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b=nkLObLAr; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966578AbcBDR3g (ORCPT ); Thu, 4 Feb 2016 12:29:36 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:34749 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966194AbcBDR3d (ORCPT ); Thu, 4 Feb 2016 12:29:33 -0500 Received: by mail-wm0-f44.google.com with SMTP id 128so37644786wmz.1 for ; Thu, 04 Feb 2016 09:29:32 -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=dlsGg9qvVTpRYbFFAqVtChHMvgXjvVquUHYsywT9PuI=; b=nkLObLArkYMUochBW9jgnKqVdCR9n/sLokkSXtuMalwN8/weV7eOE9iEJIBcpKoVzW dnVNoLhqVkfHe4h5a5VP1ZRRdfJ4TwW+RlBkyYnj1YPQrGOnbqtrKixPKVCWWJhkuzH3 ylSUps9eoZYsns/gaiIjtqRTVqgstNMviklt3xgR53LE2C9LLKOcz4yTTaD1tN87ZirS UkUplKmGIlavVh3bqOjNFedaaJWAZXPYDNjIY2wvZALcaoGubivpDBb0sbvisckeZO9F 4XJ+ahLfLz1BOUk7qemPQQlzl6t9FfSKyRW6SQcGCUWXRO/Y8vXAriafjmnnV6tC6670 6apw== 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=dlsGg9qvVTpRYbFFAqVtChHMvgXjvVquUHYsywT9PuI=; b=GZeXxToa1vxTFhFT0RheeHiecaugbSPEU7r3vcjD5i2Julq65i/l9dlgobkteAShge CJG80eeWWdSUluoJi3AwORAqWefto0tNuXozKufuQkHnUUb1sMQ96L/clI/m5eLoKsN8 jQDhNX0iWweax+2utmNb4xBg7nrk2eTo5wwvAm71Nm8gVz9RD49JV/A39D3LoN+gNxrb N+UegL9b1IApFXWqXSqoaLu39QQRf+9Facg8X81yvYEIZPGPPQ8wqE9aShNUZE8ZNiUm 2JU+VpQbJrWjUy7B2yD5mZN5Q4BiNpempDgDCv3JIQyellYkjfrPFoQ05ZJtCOk0rBn7 gcwA== X-Gm-Message-State: AG10YOT01a8LJDFjoegWS4CE82wlkUlzCaaGZMMVa2XfsAMyyy4NAnHsjzH/TVihNCOpzQ== X-Received: by 10.194.158.135 with SMTP id wu7mr9520790wjb.142.1454606972320; Thu, 04 Feb 2016 09:29:32 -0800 (PST) Received: from tn-HP-4.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id w8sm12238889wjx.21.2016.02.04.09.29.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Feb 2016 09:29:31 -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, 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 V4 17/23] acpi, mcfg: Add default PCI config accessors implementation and initial support for related quirks. Date: Thu, 4 Feb 2016 18:28:55 +0100 Message-Id: <1454606941-9523-18-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454606941-9523-1-git-send-email-tn@semihalf.com> References: <1454606941-9523-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 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 to take acpi_pci_root structure as an arguments and left some space for quirk matching algorithm. Signed-off-by: Tomasz Nowicki Tested-by: Duc Dang Tested-by: Dongdong Liu Tested-by: Hanjun Guo Tested-by: Graeme Gregory Tested-by: Sinan Kaya --- 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..dfc2d14 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(struct acpi_pci_root *root) +{ + /* + * 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 65b91f3..c974586 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -83,10 +83,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(struct acpi_pci_root *root); +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(struct acpi_pci_root *root) +{ return NULL; } +static inline void __iomem * +pci_mcfg_dev_base(struct pci_bus *bus, unsigned int devfn, int offset) +{ return NULL; } #endif #ifdef CONFIG_ACPI_PCI_SLOT