Patchwork PCI/X86: increase info->res_num before checking pci_use_crs return

login
register
mail settings
Submitter Yijing Wang
Date May 28, 2013, 2:55 a.m.
Message ID <1369709709-14504-1-git-send-email-wangyijing@huawei.com>
Download mbox | patch
Permalink /patch/246688/
State Accepted
Headers show

Comments

Yijing Wang - May 28, 2013, 2:55 a.m.
I separate this patch from patchset "Add hostbridge resource release to
support root bus hotplug in IA64", because it's a Separate issue.

We should increase info->res_num before we checking pci_use_crs return
when pci=nocrs set.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Feng Tang <feng.tang@intel.com>
---
 arch/x86/pci/acpi.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
Yinghai Lu - May 28, 2013, 4:35 a.m.
On Mon, May 27, 2013 at 7:55 PM, Yijing Wang <wangyijing@huawei.com> wrote:
> I separate this patch from patchset "Add hostbridge resource release to
> support root bus hotplug in IA64", because it's a Separate issue.
>
> We should increase info->res_num before we checking pci_use_crs return
> when pci=nocrs set.

there is no function change or issue here.

>
> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
> Cc: Yinghai Lu <yinghai@kernel.org>
> Cc: Jiang Liu <liuj97@gmail.com>
> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
> Cc: Feng Tang <feng.tang@intel.com>
> ---
>  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;
>  }

info->res_num is not used after probe_pci_root_info for pci_nocrs case.

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yijing Wang - May 28, 2013, 4:50 a.m.
On 2013/5/28 12:35, Yinghai Lu wrote:
> On Mon, May 27, 2013 at 7:55 PM, Yijing Wang <wangyijing@huawei.com> wrote:
>> I separate this patch from patchset "Add hostbridge resource release to
>> support root bus hotplug in IA64", because it's a Separate issue.
>>
>> We should increase info->res_num before we checking pci_use_crs return
>> when pci=nocrs set.
> 
> there is no function change or issue here.

Hi Yinghai,
   Thanks for review and comments!
Yes, this patch is no functional change. I just sent this patch for make code flow more clearly.
Because free_pci_root_info_res() will free all info->res and info->res_offset. So I think move info->res_num++
before pci_use_crs check is better, better readability.

> 
>>
>> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
>> Cc: Yinghai Lu <yinghai@kernel.org>
>> Cc: Jiang Liu <liuj97@gmail.com>
>> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
>> Cc: Feng Tang <feng.tang@intel.com>
>> ---
>>  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;
>>  }
> 
> info->res_num is not used after probe_pci_root_info for pci_nocrs case.
> 
> Thanks
> 
> Yinghai
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
>
Yinghai Lu - May 28, 2013, 4:54 a.m.
On Mon, May 27, 2013 at 9:50 PM, Yijing Wang <wangyijing@huawei.com> wrote:
> On 2013/5/28 12:35, Yinghai Lu wrote:
>> On Mon, May 27, 2013 at 7:55 PM, Yijing Wang <wangyijing@huawei.com> wrote:
>>> I separate this patch from patchset "Add hostbridge resource release to
>>> support root bus hotplug in IA64", because it's a Separate issue.
>>>
>>> We should increase info->res_num before we checking pci_use_crs return
>>> when pci=nocrs set.
>>
>> there is no function change or issue here.
>
> Hi Yinghai,
>    Thanks for review and comments!
> Yes, this patch is no functional change. I just sent this patch for make code flow more clearly.
> Because free_pci_root_info_res() will free all info->res and info->res_offset. So I think move info->res_num++
> before pci_use_crs check is better, better readability.

sure.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas - May 28, 2013, 5:24 p.m.
On Mon, May 27, 2013 at 8:55 PM, Yijing Wang <wangyijing@huawei.com> wrote:
> I separate this patch from patchset "Add hostbridge resource release to
> support root bus hotplug in IA64", because it's a Separate issue.
>
> We should increase info->res_num before we checking pci_use_crs return
> when pci=nocrs set.
>
> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
> Cc: Yinghai Lu <yinghai@kernel.org>
> Cc: Jiang Liu <liuj97@gmail.com>
> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
> Cc: Feng Tang <feng.tang@intel.com>
> ---
>  arch/x86/pci/acpi.c |    7 ++-----
>  1 files changed, 2 insertions(+), 5 deletions(-)

Applied to pci/misc for v3.11, thanks!

> 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
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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;
 }