PCI/IA64: SN: use normal resource instead of pci_window
PATCH 2/8 PCI/IA64: SN: use normal resource instead of pci_window
Pci_window in pci_controller will not be used again, use normal resource instead of pci_window in sn_legacy_pci_window_fixup(), this patch is to prepare remove pci_window in IA64.
--- arch/ia64/sn/kernel/io_init.c | 54 +++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 29 deletions(-)
arch/ia64/sn/kernel/io_init.c +25 -27
@@ -118,34 +118,29 @@ static void __init sn_fixup_ionodes(void) }/* -* sn_pci_legacy_window_fixup - Create PCI controller windows for +* sn_pci_legacy_window_fixup - Create PCI resources for * legacy IO and MEM space. This needs to * be done here, as the PROM does not have * ACPI support defining the root buses * and their resources (_CRS), */ static void -sn_legacy_pci_window_fixup (struct pci_controller *controller, -u64 legacy_io,u64 legacy_mem) +sn_legacy_pci_window_fixup (struct resource *res, +u64 legacy_io,u64 legacy_mem) { - controller->window =kcalloc (2 ,sizeof (struct pci_window ), + res =kcalloc (2 ,sizeof (struct resource ),GFP_KERNEL ); -BUG_ON (controller->window =NULL ); - controller->window[0 ].offset = legacy_io; - controller->window[0 ].resource.name ="legacy_io" ; - controller->window[0 ].resource.flags =IORESOURCE_IO ; - controller->window[0 ].resource.start = legacy_io; - controller->window[0 ].resource.end - controller->window[0 ].resource.start +0xffff ; - controller->window[0 ].resource.parent = &ioport_resource; - controller->window[1 ].offset = legacy_mem; - controller->window[1 ].resource.name ="legacy_mem" ; - controller->window[1 ].resource.flags =IORESOURCE_MEM ; - controller->window[1 ].resource.start = legacy_mem; - controller->window[1 ].resource.end - controller->window[1 ].resource.start + (1024 *1024 ) -1 ; - controller->window[1 ].resource.parent = &iomem_resource; - controller->windows =2 ; +BUG_ON (res =NULL ); + res[0 ].name ="legacy_io" ; + res[0 ].flags =IORESOURCE_IO ; + res[0 ].start = legacy_io; + res[0 ].end = res->start +0xffff ; + res[0 ].parent = &ioport_resource; + res[1 ].name ="legacy_mem" ; + res[1 ].flags =IORESOURCE_MEM ; + res[1 ].start = legacy_mem; + res[1 ].end = res->start + (1024 *1024 ) -1 ; + res[1 ].parent = &iomem_resource; }/*
@@ -244,8 +239,8 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)s64 status =0 ;struct pci_controller *controller;struct pcibus_bussoft *prom_bussoft_ptr; +struct resource *res =NULL ;LIST_HEAD (resources); -int i; status =sal_get_pcibus_info ((u64 ) segment, (u64 ) busnum, (u64 )ia64_tpa (&prom_bussoft_ptr));
@@ -263,13 +258,14 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)*/ controller->platform_data = prom_bussoft_ptr; -sn_legacy_pci_window_fixup (controller, - prom_bussoft_ptr->bs_legacy_io, - prom_bussoft_ptr->bs_legacy_mem); -for (i =0 ; i < controller->windows; i++) -pci_add_resource_offset (&resources, - &controller->window[i].resource, - controller->window[i].offset); +sn_legacy_pci_window_fixup (res, + prom_bussoft_ptr->bs_legacy_io, + prom_bussoft_ptr->bs_legacy_mem); +pci_add_resource_offset (&resources, &res[0 ], + prom_bussoft_ptr->bs_legacy_io); +pci_add_resource_offset (&resources, &res[1 ], + prom_bussoft_ptr->bs_legacy_mem); + bus =pci_scan_root_bus (NULL , busnum, &pci_root_ops, controller, &resources);if (bus =NULL )
@@ -280,7 +276,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)return ; error_return: - +kfree (res);kfree (controller);return ; }
Signature · 1 line
1.7.1
It probably wouldn't hurt to cc some SGI folks.
Quoted 24 lines · Yijing Wang
Pci_windowinpci_controllerwill not be used again, use normal resource instead ofpci_windowinsn_legacy_pci_window_fixup(), this patch is to prepare removepci_windowin IA64.Signed-off-by Yijing Wang <[email protected]>--- arch/ia64/sn/kernel/io_init.c | 54 +++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 29 deletions(-)arch/ia64/sn/kernel/io_init.c +1
-1@@ -118,34 +118,29 @@ static void __init sn_fixup_ionodes(void) }/* -* sn_pci_legacy_window_fixup - Create PCI controller windows for +* sn_pci_legacy_window_fixup - Create PCI resources for * legacy IO and MEM space. This needs to * be done here, as the PROM does not have * ACPI support defining the root buses * and their resources (_CRS),
arch/ia64/sn/kernel/io_init.c static void __init sn_fixup_ionodes(void) · line 132
Quoted 10 lines
arch/ia64/sn/kernel/io_init.c +3
-3*/ static void -sn_legacy_pci_window_fixup (struct pci_controller *controller, -u64 legacy_io,u64 legacy_mem) +sn_legacy_pci_window_fixup (struct resource *res, +u64 legacy_io,u64 legacy_mem) { - controller->window =kcalloc (2 ,sizeof (struct pci_window ), + res =kcalloc (2 ,sizeof (struct resource ),GFP_KERNEL );
This looks totally bogus. You kcalloc() "res", but you never save the pointer anywhere.
Quoted 9 lines
arch/ia64/sn/kernel/io_init.c +0
-9-BUG_ON (controller->window =NULL ); - controller->window[0 ].offset = legacy_io; - controller->window[0 ].resource.name ="legacy_io" ; - controller->window[0 ].resource.flags =IORESOURCE_IO ; - controller->window[0 ].resource.start = legacy_io; - controller->window[0 ].resource.end > - controller->window[0 ].resource.start +0xffff ; - controller->window[0 ].resource.parent = &ioport_resource; - controller->window[1 ].offset = legacy_mem; - controller->window[1 ].resource.name ="legacy_mem" ;
arch/ia64/sn/kernel/io_init.c static void __init sn_fixup_ionodes(void) · line 137
Quoted 10 lines
arch/ia64/sn/kernel/io_init.c +5
-5- controller->window[1 ].resource.flags =IORESOURCE_MEM ; - controller->window[1 ].resource.start = legacy_mem; - controller->window[1 ].resource.end > - controller->window[1 ].resource.start + (1024 *1024 ) -1 ; - controller->window[1 ].resource.parent = &iomem_resource; - controller->windows =2 ; +BUG_ON (res =NULL ); + res[0 ].name ="legacy_io" ; + res[0 ].flags =IORESOURCE_IO ; + res[0 ].start = legacy_io; + res[0 ].end = res->start +0xffff ;
I think you meant "res[0].start + 0xffff" here.
arch/ia64/sn/kernel/io_init.c static void __init sn_fixup_ionodes(void) · line 142
Quoted 5 lines
arch/ia64/sn/kernel/io_init.c +5
-0+ res[0 ].parent = &ioport_resource; + res[1 ].name ="legacy_mem" ; + res[1 ].flags =IORESOURCE_MEM ; + res[1 ].start = legacy_mem; + res[1 ].end = res->start + (1024 *1024 ) -1 ;
And "res[1].start + (1024 * 1024) - 1" here.
Quoted 49 lines
arch/ia64/sn/kernel/io_init.c +11
-10+ res[1 ].parent = &iomem_resource; }/* @@ -244,8 +239,8 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)s64 status =0 ;struct pci_controller *controller;struct pcibus_bussoft *prom_bussoft_ptr; +struct resource *res =NULL ;LIST_HEAD (resources); -int i; status =sal_get_pcibus_info ((u64 ) segment, (u64 ) busnum, (u64 )ia64_tpa (&prom_bussoft_ptr));@@ -263,13 +258,14 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)*/ controller->platform_data = prom_bussoft_ptr; -sn_legacy_pci_window_fixup (controller, - prom_bussoft_ptr->bs_legacy_io, - prom_bussoft_ptr->bs_legacy_mem); -for (i =0 ; i < controller->windows; i++) -pci_add_resource_offset (&resources, - &controller->window[i].resource, - controller->window[i].offset); +sn_legacy_pci_window_fixup (res, + prom_bussoft_ptr->bs_legacy_io, + prom_bussoft_ptr->bs_legacy_mem); +pci_add_resource_offset (&resources, &res[0 ], + prom_bussoft_ptr->bs_legacy_io); +pci_add_resource_offset (&resources, &res[1 ], + prom_bussoft_ptr->bs_legacy_mem); + bus =pci_scan_root_bus (NULL , busnum, &pci_root_ops, controller, &resources);if (bus =NULL )@@ -280,7 +276,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)return ; error_return: - +kfree (res);kfree (controller);return ; } --1.7.1
Hi Bjorn,
Thanks for your review and comments very much!
Quoted 1 line · Bjorn Helgaas
It probably wouldn't hurt to cc some SGI folks.
OK, because I cannot get SGI folks by scripts/get_maintainer.pl, I will try to add cc some SGI folks from git log history.
Quoted 8 lines · Yijing Wang
Quoted 3 lines
Pci_windowinpci_controllerwill not be used again, use normal resource instead ofpci_windowinGFP_KERNEL);This looks totally bogus. You
kcalloc()"res", but you never save the pointer anywhere.
I'm very sorry so much. That's totally my fault. I will fix this right now.
Thanks!
Quoted 21 lines
Quoted 10 lines
arch/ia64/sn/kernel/io_init.c +0
-9-BUG_ON (controller->window =NULL ); - controller->window[0 ].offset = legacy_io; - controller->window[0 ].resource.name ="legacy_io" ; - controller->window[0 ].resource.flags =IORESOURCE_IO ; - controller->window[0 ].resource.start = legacy_io; - controller->window[0 ].resource.end >> - controller->window[0 ].resource.start +0xffff ; - controller->window[0 ].resource.parent = &ioport_resource; - controller->window[1 ].offset = legacy_mem; - controller->window[1 ].resource.name ="legacy_mem" ;arch/ia64/sn/kernel/io_init.c static void __init sn_fixup_ionodes(void) · line 137
Quoted 10 lines
arch/ia64/sn/kernel/io_init.c +5
-5- controller->window[1 ].resource.flags =IORESOURCE_MEM ; - controller->window[1 ].resource.start = legacy_mem; - controller->window[1 ].resource.end >> - controller->window[1 ].resource.start + (1024 *1024 ) -1 ; - controller->window[1 ].resource.parent = &iomem_resource; - controller->windows =2 ; +BUG_ON (res =NULL ); + res[0 ].name ="legacy_io" ; + res[0 ].flags =IORESOURCE_IO ; + res[0 ].start = legacy_io; + res[0 ].end = res->start +0xffff ;
Quoted 1 line
I think you meant "res[0].start +
0xffff" here.
Yes, it's my negligence, sorry.
Quoted 8 lines
arch/ia64/sn/kernel/io_init.c static void __init sn_fixup_ionodes(void) · line 142
Quoted 6 lines
arch/ia64/sn/kernel/io_init.c +5
-0+ res[0 ].parent = &ioport_resource; + res[1 ].name ="legacy_mem" ; + res[1 ].flags =IORESOURCE_MEM ; + res[1 ].start = legacy_mem; + res[1 ].end = res->start + (1024 *1024 ) -1 ;And "res[1].start + (1024 * 1024) - 1" here.
sorry, will update it.
Quoted 53 lines
Quoted 47 lines
arch/ia64/sn/kernel/io_init.c +11
-10+ res[1 ].parent = &iomem_resource; }/* @@ -244,8 +239,8 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)s64 status =0 ;struct pci_controller *controller;struct pcibus_bussoft *prom_bussoft_ptr; +struct resource *res =NULL ;LIST_HEAD (resources); -int i; status =sal_get_pcibus_info ((u64 ) segment, (u64 ) busnum, (u64 )ia64_tpa (&prom_bussoft_ptr));@@ -263,13 +258,14 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)*/ controller->platform_data = prom_bussoft_ptr; -sn_legacy_pci_window_fixup (controller, - prom_bussoft_ptr->bs_legacy_io, - prom_bussoft_ptr->bs_legacy_mem); -for (i =0 ; i < controller->windows; i++) -pci_add_resource_offset (&resources, - &controller->window[i].resource, - controller->window[i].offset); +sn_legacy_pci_window_fixup (res, + prom_bussoft_ptr->bs_legacy_io, + prom_bussoft_ptr->bs_legacy_mem); +pci_add_resource_offset (&resources, &res[0 ], + prom_bussoft_ptr->bs_legacy_io); +pci_add_resource_offset (&resources, &res[1 ], + prom_bussoft_ptr->bs_legacy_mem); + bus =pci_scan_root_bus (NULL , busnum, &pci_root_ops, controller, &resources);if (bus =NULL )@@ -280,7 +276,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)return ; error_return: - +kfree (res);kfree (controller);return ; } --Quoted 3 lines
1.7.1
.
Signature · 2 lines
Thanks! Yijing