From patchwork Fri Jun 22 06:55:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 166524 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 5F650B6FA5 for ; Fri, 22 Jun 2012 16:56:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760369Ab2FVG4w (ORCPT ); Fri, 22 Jun 2012 02:56:52 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:65325 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760342Ab2FVG4v (ORCPT ); Fri, 22 Jun 2012 02:56:51 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so3169265pbb.19 for ; Thu, 21 Jun 2012 23:56:51 -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=/gUM3480CZ+E3v4D9jDURM03k9CMgBRoTtn+fjFClZ0=; b=uGzoo6KY7hJq4yQChAuKlEVkcDt41oWc2eO1VQa0W7+wAHAfxqtYxzvR12dJOSJRvC opAsDU7ZQPErzYoXYPUVMRJRmd8afpWRGgB3pKs6slKqeWAHYoPCnHg+3Ca9GgpjtUFH JZUnZvgMygzNh2duqOwcpaQT6PqApnVLKPmY1iC49qWGwu7XP6syQpntHVd+cxnsrj4C 5Szbe+GTQaaPUZ7LpX6CWR2EplRm21N3rNf33IMtYYWk99CJXqnQlYuosow6h6xIhOej NsoteSECB121Oqfi6m9P6buiMw/zGQ8t/0UQJlrHmBlJQR8ntEM3qj2sSaWWPzdqy5vr gX/A== Received: by 10.68.226.131 with SMTP id rs3mr1774182pbc.62.1340348211549; Thu, 21 Jun 2012 23:56:51 -0700 (PDT) Received: from localhost.localdomain ([221.221.22.188]) by mx.google.com with ESMTPS id qp9sm20540743pbc.9.2012.06.21.23.56.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 21 Jun 2012 23:56:50 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu , Kenji Kaneshige , Taku Izumi , Don Dutile Cc: Jiang Liu , Keping Chen , Yijing Wang , linux-pci@vger.kernel.org, Jiang Liu Subject: [PATCH v10 01/13] x86/PCI: split out pci_mmcfg_check_reserved() for code reuse Date: Fri, 22 Jun 2012 14:55:10 +0800 Message-Id: <1340348122-29021-2-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340348122-29021-1-git-send-email-jiang.liu@huawei.com> References: <1340348122-29021-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 Split out pci_mmcfg_check_reserved() for code reuse, which will be used when supporting PCI host bridge hotplug. Signed-off-by: Jiang Liu Signed-off-by: Bjorn Helgaas --- arch/x86/pci/mmconfig-shared.c | 51 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 301e325..f799949 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c @@ -474,39 +474,38 @@ static int __init is_mmconf_reserved(check_reserved_t is_reserved, return valid; } +static int __devinit pci_mmcfg_check_reserved(struct pci_mmcfg_region *cfg, + int early) +{ + if (!early && !acpi_disabled) { + if (is_mmconf_reserved(is_acpi_reserved, cfg, 0)) + return 1; + else + printk(KERN_ERR FW_BUG PREFIX + "MMCONFIG at %pR not reserved in " + "ACPI motherboard resources\n", + &cfg->res); + } + + /* Don't try to do this check unless configuration + type 1 is available. how about type 2 ?*/ + if (raw_pci_ops) + return is_mmconf_reserved(e820_all_mapped, cfg, 1); + + return 0; +} + static void __init pci_mmcfg_reject_broken(int early) { struct pci_mmcfg_region *cfg; list_for_each_entry(cfg, &pci_mmcfg_list, list) { - int valid = 0; - - if (!early && !acpi_disabled) { - valid = is_mmconf_reserved(is_acpi_reserved, cfg, 0); - - if (valid) - continue; - else - printk(KERN_ERR FW_BUG PREFIX - "MMCONFIG at %pR not reserved in " - "ACPI motherboard resources\n", - &cfg->res); + if (pci_mmcfg_check_reserved(cfg, early) == 0) { + printk(KERN_INFO PREFIX "not using MMCONFIG\n"); + free_all_mmcfg(); + return; } - - /* Don't try to do this check unless configuration - type 1 is available. how about type 2 ?*/ - if (raw_pci_ops) - valid = is_mmconf_reserved(e820_all_mapped, cfg, 1); - - if (!valid) - goto reject; } - - return; - -reject: - printk(KERN_INFO PREFIX "not using MMCONFIG\n"); - free_all_mmcfg(); } static int __initdata known_bridge;