From patchwork Sat May 5 03:00:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 157019 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 6ECF6B6FD7 for ; Sat, 5 May 2012 13:01:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755155Ab2EEDBZ (ORCPT ); Fri, 4 May 2012 23:01:25 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:34775 "EHLO mail-pz0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755102Ab2EEDBZ (ORCPT ); Fri, 4 May 2012 23:01:25 -0400 Received: by mail-pz0-f45.google.com with SMTP id v2so4922736dad.4 for ; Fri, 04 May 2012 20:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=fI3JeH6GGloV6w49eSzHw/VzSJ/GNGsq4dOmzEKQlVA=; b=P+MHLxY9f+gH7regv16UkkV9PmZHf+7P9W1PYKZKcpXE0qhlj3gP6cgBPJMsra8unV 5xku4tDLb/HNq9YqsC4LuEWoRTbLruwa0UA/XWm3V0pRXW5DXRBB43BcObDCi3reXVNn PjT/0a6cSjkgdPN/PmDunyMnB/y/DanJVJY/PusV9cxUb1EB98tOHKO5FpHltziUq8bC d/W1M3964vIhAL9rB5EPhvkVGSmTzrtTDNgUbOWn8KEEoSM3luWBIzxb3x9eRF6mfVOe m+vJmdS280+3Eq2IG1TTaxXDouts20Wz0a1ha2x8iAq9/ueyy2S4weu7cPQxtQ7pHjey UY7w== Received: by 10.68.203.40 with SMTP id kn8mr24152662pbc.162.1336186884990; Fri, 04 May 2012 20:01:24 -0700 (PDT) Received: from localhost.localdomain ([221.221.18.198]) by mx.google.com with ESMTPS id uy6sm162103pbc.52.2012.05.04.20.01.16 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 May 2012 20:01:24 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Taku Izumi , Yinghai Lu Cc: Jiang Liu , Kenji Kaneshige , Don Dutile , Keping Chen , linux-pci@vger.kernel.org, Jiang Liu Subject: [PATCH v5 4/6] PCI, x86: introduce pci_mmcfg_arch_map()/pci_mmcfg_arch_unmap() Date: Sat, 5 May 2012 11:00:28 +0800 Message-Id: <1336186830-10765-5-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1336186830-10765-1-git-send-email-jiang.liu@huawei.com> References: <1336186830-10765-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu Introduce pci_mmcfg_arch_map()/pci_mmcfg_arch_unmap(), which will be used when supporting PCI root bridge hotplug. Signed-off-by: Jiang Liu --- arch/x86/include/asm/pci_x86.h | 2 ++ arch/x86/pci/mmconfig_32.c | 15 +++++++++++++++ arch/x86/pci/mmconfig_64.c | 22 +++++++++++++++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index b3a5317..df898ce 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -135,6 +135,8 @@ struct pci_mmcfg_region { extern int __init pci_mmcfg_arch_init(void); extern void __init pci_mmcfg_arch_free(void); +extern int __devinit pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg); +extern void pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg); extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus); extern struct list_head pci_mmcfg_list; diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c index 5dad04a..a22785d 100644 --- a/arch/x86/pci/mmconfig_32.c +++ b/arch/x86/pci/mmconfig_32.c @@ -141,3 +141,18 @@ int __init pci_mmcfg_arch_init(void) void __init pci_mmcfg_arch_free(void) { } + +int __devinit pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg) +{ + return 0; +} + +void pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg) +{ + unsigned long flags; + + /* Invalidate the cached mmcfg map entry. */ + raw_spin_lock_irqsave(&pci_config_lock, flags); + mmcfg_last_accessed_device = 0; + raw_spin_unlock_irqrestore(&pci_config_lock, flags); +} diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c index acc48c5..4e05779 100644 --- a/arch/x86/pci/mmconfig_64.c +++ b/arch/x86/pci/mmconfig_64.c @@ -95,7 +95,7 @@ static const struct pci_raw_ops pci_mmcfg = { .write = pci_mmcfg_write, }; -static void __iomem * __init mcfg_ioremap(struct pci_mmcfg_region *cfg) +static void __iomem * __devinit mcfg_ioremap(struct pci_mmcfg_region *cfg) { void __iomem *addr; u64 start, size; @@ -138,3 +138,23 @@ void __init pci_mmcfg_arch_free(void) } } } + +int __devinit pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg) +{ + cfg->virt = mcfg_ioremap(cfg); + if (!cfg->virt) { + printk(KERN_ERR PREFIX "can't map MMCONFIG at %pR\n", + &cfg->res); + return -ENOMEM; + } + + return 0; +} + +void pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg) +{ + if (cfg && cfg->virt) { + iounmap(cfg->virt + PCI_MMCFG_BUS_OFFSET(cfg->start_bus)); + cfg->virt = NULL; + } +}