x86/pci: claim SR-IOV bar in pcibios_allocate_resource
PATCH 1/1 x86/pci: claim SR-IOV bar in pcibios_allocate_resource
so use correct allocation from BIOS, instead of later assign another one.
--- arch/x86/pci/i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/pci/i386.c +3 -1
@@ -155,7 +155,9 @@ static void __init pcibios_allocate_resofor_each_pci_dev (dev) {pci_read_config_word (dev,PCI_COMMAND , &command); -for (idx =0 ; idx <PCI_ROM_RESOURCE ; idx++) { +for (idx =0 ; idx <PCI_BRIDGE_RESOURCES ; idx++) { +if (idx ==PCI_ROM_RESOURCE ) +continue ; r = &dev->resource[idx];if (r->parent)/* Already allocated */ continue ;
Quoted 15 lines · On Sat, 14 Nov 2009 23:46:46 -0800 Yinghai Lu <[email protected]> wrote:
so use correct allocation from BIOS, instead of later assign another one.
Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/pci/i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Index:
linux-2.6/arch/x86/pci/i386.c
===================================================================
arch/x86/pci/i386.c static void __init pcibios_allocate_reso · line 163
Quoted 10 lines
arch/x86/pci/i386.c +3
-1@@ -155,7 +155,9 @@ static void __init pcibios_allocate_resofor_each_pci_dev (dev) {pci_read_config_word (dev,PCI_COMMAND , &command); -for (idx =0 ; idx <PCI_ROM_RESOURCE ; idx++) { +for (idx =0 ; idx <PCI_BRIDGE_RESOURCES ; idx++) { +if (idx ==PCI_ROM_RESOURCE ) +continue ; r = &dev->resource[idx];if (r->parent)/* Already allocated */ continue ;
I'm worried this might have side effects beyond just allocating SR-IOV BARs, since it looks like we'll walk through all the bridge resources all the time?
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 18 lines · Jesse Barnes
Quoted 15 lines · On Sat, 14 Nov 2009 23:46:46 -0800 Yinghai Lu <[email protected]> wrote:
so use correct allocation from BIOS, instead of later assign another one.
Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/pci/i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Index:
linux-2.6/arch/x86/pci/i386.c
===================================================================arch/x86/pci/i386.c +0
-0@@ -155,7 +155,9 @@ static void __init pcibios_allocate_reso
Quoted 13 lines
arch/x86/pci/i386.c static void __init pcibios_allocate_reso
Quoted 9 lines
arch/x86/pci/i386.c +3
-1for_each_pci_dev (dev) {pci_read_config_word (dev,PCI_COMMAND , &command); -for (idx =0 ; idx <PCI_ROM_RESOURCE ; idx++) { +for (idx =0 ; idx <PCI_BRIDGE_RESOURCES ; idx++) { +if (idx ==PCI_ROM_RESOURCE ) +continue ; r = &dev->resource[idx];if (r->parent)/* Already allocated */ continue ;I'm worried this might have side effects beyond just allocating SR-IOV BARs, since it looks like we'll walk through all the bridge resources all the time?
/*
* For PCI devices, the region numbers are assigned this way:
*/
enum {
/* #0-5: standard PCI resources */
PCI_STD_RESOURCES,
PCI_STD_RESOURCE_END = 5,
/* #6: expansion ROM resource */
PCI_ROM_RESOURCE,
/* device specific resources */#ifdef CONFIG_PCI_IOV
PCI_IOV_RESOURCES,
PCI_IOV_RESOURCE_END = PCI_IOV_RESOURCES + PCI_SRIOV_NUM_BARS - 1,
#endif
/* resources assigned to buses behind the bridge */
#define PCI_BRIDGE_RESOURCE_NUM 4
PCI_BRIDGE_RESOURCES,
so will only add IOV BAR related.
YH
Quoted 50 lines · On Tue, 24 Nov 2009 13:21:45 -0800 Yinghai Lu <[email protected]> wrote:
Quoted 18 lines · Jesse Barnes
Quoted 15 lines · On Sat, 14 Nov 2009 23:46:46 -0800 Yinghai Lu <[email protected]> wrote:
so use correct allocation from BIOS, instead of later assign another one.
Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/pci/i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Index:
linux-2.6/arch/x86/pci/i386.c
===================================================================arch/x86/pci/i386.c +0
-0@@ -155,7 +155,9 @@ static void __init pcibios_allocate_resoQuoted 13 lines
arch/x86/pci/i386.c static void __init pcibios_allocate_reso
Quoted 9 lines
arch/x86/pci/i386.c +3
-1for_each_pci_dev (dev) {pci_read_config_word (dev,PCI_COMMAND , &command); -for (idx =0 ; idx <PCI_ROM_RESOURCE ; idx++) { +for (idx =0 ; idx <PCI_BRIDGE_RESOURCES ; idx++) { +if (idx ==PCI_ROM_RESOURCE ) +continue ; r = &dev->resource[idx];if (r->parent)/* Already allocated */ continue ;I'm worried this might have side effects beyond just allocating SR-IOV BARs, since it looks like we'll walk through all the bridge resources all the time?
/*
* For PCI devices, the region numbers are assigned this way:
*/enum { /* #0-5: standard PCI resources */ PCI_STD_RESOURCES, PCI_STD_RESOURCE_END = 5, /* #6: expansion ROM resource */ PCI_ROM_RESOURCE, /* device specific resources */#ifdef
CONFIG_PCI_IOV
PCI_IOV_RESOURCES,
PCI_IOV_RESOURCE_END=PCI_IOV_RESOURCES+PCI_SRIOV_NUM_BARS
- 1, #endif
Quoted 6 lines
/* resources assigned to buses behind the bridge */#define
PCI_BRIDGE_RESOURCE_NUM4
PCI_BRIDGE_RESOURCES,so will only add IOV BAR related.
Oh right, *up to* bridge resources... Still we should probably add a comment about that. SR-IOV is still somewhat new.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 1/1 x86/pci: claim SR-IOV bar in pcibios_allocate_resource -v2
so use correct allocation from BIOS, instead of later assign another one.
-v2: use idx_range, so make it more clear
--- arch/x86/pci/i386.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
arch/x86/pci/i386.c +15 -2
@@ -146,16 +146,29 @@ static void __init pcibios_allocate_bus_ } } +struct pci_check_idx_range { +int start; +int end; +}; +static void __init pcibios_allocate_resources (int pass) {struct pci_dev *dev =NULL ; -int idx, disabled; +int idx, disabled, i;u16 command;struct resource *r; +struct pci_check_idx_range idx_range[] = { + {PCI_STD_RESOURCES ,PCI_STD_RESOURCE_END }, +#ifdef CONFIG_PCI_IOV + {PCI_IOV_RESOURCES ,PCI_IOV_RESOURCE_END }, +#endif + }; +for_each_pci_dev (dev) {pci_read_config_word (dev,PCI_COMMAND , &command); -for (idx =0 ; idx <PCI_ROM_RESOURCE ; idx++) { +for (i =0 ; i <ARRAY_SIZE (idx_range); i++) +for (idx = idx_range[i].start; idx <= idx_range[i].end; idx++) { r = &dev->resource[idx];if (r->parent)/* Already allocated */ continue ;
Jesse Barnes
AppliedRe: [PATCH] x86/pci: claim SR-IOV bar in pcibios_allocate_resource -v2
Quoted 4 lines · On Tue, 24 Nov 2009 18:05:12 -0800 Yinghai Lu <[email protected]> wrote:
so use correct allocation from BIOS, instead of later assign another one.
Applied, thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center