From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga01-in.huawei.com ([119.145.14.64]:59143 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752256Ab3EQJ4g (ORCPT ); Fri, 17 May 2013 05:56:36 -0400 From: Yijing Wang To: Bjorn Helgaas CC: , Hanjun Guo , , Yijing Wang , Yinghai Lu , Jiang Liu , "Rafael J. Wysocki" , Feng Tang Subject: [PATCH -v2 1/7] PCI/X86: fix always use info->res[0] to store _CRS resource when pci=nocrs set Date: Fri, 17 May 2013 17:55:44 +0800 Message-ID: <1368784550-18332-2-git-send-email-wangyijing@huawei.com> In-Reply-To: <1368784550-18332-1-git-send-email-wangyijing@huawei.com> References: <1368784550-18332-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-pci-owner@vger.kernel.org List-ID: We should increase info->res_num before checking pci_use_crs return, otherwise only the res[0] of pci_root_info will be used during setup_resource() when pci=nocrs set. And the old resource value will be overwritten by new resource item. Signed-off-by: Yijing Wang Cc: Yinghai Lu Cc: Jiang Liu Cc: "Rafael J. Wysocki" Cc: Feng Tang --- arch/x86/pci/acpi.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 3e72425..662dfdf 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -324,14 +324,11 @@ setup_resource(struct acpi_resource *acpi_res, void *data) res->start = start; res->end = end; info->res_offset[info->res_num] = addr.translation_offset; + info->res_num++; - if (!pci_use_crs) { + if (!pci_use_crs) dev_printk(KERN_DEBUG, &info->bridge->dev, "host bridge window %pR (ignored)\n", res); - return AE_OK; - } - - info->res_num++; return AE_OK; } -- 1.7.1