Fix debug printks for 32-bit resources in the PCI code
PATCH 1/1 Fix debug printks for 32-bit resources in the PCI code
Cure the damage done by the former PCI debug printks fix for the case of 64-bit resources (commit 685143ac1f7a579a3fac9c7f2ac8f82e95af6864) which broke it for the plain vanilla 32-bit resources...
arch/powerpc/kernel/pci_32.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-)
arch/powerpc/kernel/pci_32.c +11 -13
@@ -100,7 +100,7 @@ pcibios_fixup_resources(struct pci_dev *continue ;if (res->end ==0xffffffff ) {DBG ("PCI:%s Resource %d [%016llx-%016llx] is unassigned\n" , -pci_name (dev), i, res->start, res->end); +pci_name (dev), i, (u64 )res->start, (u64 )res->end); res->end -= res->start; res->start =0 ; res->flags |=IORESOURCE_UNSET ;
@@ -116,11 +116,9 @@ pcibios_fixup_resources(struct pci_dev *if (offset !=0 ) { res->start += offset; res->end += offset; -#ifdef DEBUG -printk ("Fixup res %d (%lx) of dev %s: %llx -> %llx\n" , - i, res->flags,pci_name (dev), - res->start - offset, res->start); -#endif +DBG ("Fixup res %d (%lx) of dev %s: %llx -> %llx\n" , + i, res->flags,pci_name (dev), + (u64 )res->start - offset, (u64 )res->start); } }
@@ -256,7 +254,7 @@ pcibios_allocate_bus_resources(struct li }DBG ("PCI: bridge rsrc %llx..%llx (%lx), parent %p\n" , - res->start, res->end, res->flags, pr); + (u64 )res->start, (u64 )res->end, res->flags, pr);if (pr) {if (request_resource (pr, res) ==0 )continue ;
@@ -307,7 +305,7 @@ reparent_resources(struct resource *parefor (p = res->child; p !=NULL ; p = p->sibling) { p->parent = res;DBG (KERN_INFO "PCI: reparented %s [%llx..%llx] under %s\n" , - p->name, p->start, p->end, res->name); + p->name, (u64 )p->start, (u64 )p->end, res->name); }return 0 ; }
@@ -363,7 +361,7 @@ pci_relocate_bridge_resource(struct pci_ }if (request_resource (pr, res)) {DBG (KERN_ERR "PCI: huh? couldn't move to %llx..%llx\n" , - res->start, res->end); + (u64 )res->start, (u64 )res->end);return -1 ;/* "can't happen" */ }update_bridge_base (bus, i);
@@ -481,14 +479,14 @@ static inline void alloc_resource(structstruct resource *pr, *r = &dev->resource[idx];DBG ("PCI:%s: Resource %d: %016llx-%016llx (f=%lx)\n" , -pci_name (dev), idx, r->start, r->end, r->flags); +pci_name (dev), idx, (u64 )r->start, (u64 )r->end, r->flags); pr =pci_find_parent_resource (dev, r);if (!pr ||request_resource (pr, r) <0 ) {printk (KERN_ERR "PCI: Cannot allocate resource region %d" " of device %s\n" , idx,pci_name (dev));if (pr)DBG ("PCI: parent is %p: %016llx-%016llx (f=%lx)\n" , - pr, pr->start, pr->end, pr->flags); + pr, (u64 )pr->start, (u64 )pr->end, pr->flags);/* We'll assign a new address later */ r->flags |=IORESOURCE_UNSET ; r->end -= r->start;
@@ -961,7 +959,7 @@ pci_process_bridge_OF_ranges(struct pci_ res->flags =IORESOURCE_IO ; res->start = ranges[2 ];DBG ("PCI: IO 0x%llx -> 0x%llx\n" , - res->start, res->start + size -1 ); + (u64 )res->start, (u64 )res->start + size -1 );break ;case 2 :/* memory space */ memno =0 ;
@@ -983,7 +981,7 @@ pci_process_bridge_OF_ranges(struct pci_ res->flags |=IORESOURCE_PREFETCH ; res->start = ranges[na+2 ];DBG ("PCI: MEM[%d] 0x%llx -> 0x%llx\n" , memno, - res->start, res->start + size -1 ); + (u64 )res->start, (u64 )res->start + size -1 ); }break ; }
Hello, I wrote:
Argh, forgot the signoff line again...
Quoted 3 lines
Cure the damage done by the former PCI debug printks fix for the case of 64-bit resources (commit
685143ac1f7a579a3fac9c7f2ac8f82e95af6864) which broke it for the plain vanilla 32-bit resources...
Signed-off-by Sergei Shtylyov <[email protected]>
Quoted 86 lines
arch/powerpc/kernel/pci_32.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-)Index:
powerpc/arch/powerpc/kernel/pci_32.c
===================================================================arch/powerpc/kernel/pci_32.c +10
-12@@ -100,7 +100,7 @@ pcibios_fixup_resources(struct pci_dev *continue ;if (res->end ==0xffffffff ) {DBG ("PCI:%s Resource %d [%016llx-%016llx] is unassigned\n" , -pci_name (dev), i, res->start, res->end); +pci_name (dev), i, (u64 )res->start, (u64 )res->end); res->end -= res->start; res->start =0 ; res->flags |=IORESOURCE_UNSET ;@@ -116,11 +116,9 @@ pcibios_fixup_resources(struct pci_dev *if (offset !=0 ) { res->start += offset; res->end += offset; -#ifdef DEBUG -printk ("Fixup res %d (%lx) of dev %s: %llx -> %llx\n" , - i, res->flags,pci_name (dev), - res->start - offset, res->start); -#endif +DBG ("Fixup res %d (%lx) of dev %s: %llx -> %llx\n" , + i, res->flags,pci_name (dev), + (u64 )res->start - offset, (u64 )res->start); } }@@ -256,7 +254,7 @@ pcibios_allocate_bus_resources(struct li }DBG ("PCI: bridge rsrc %llx..%llx (%lx), parent %p\n" , - res->start, res->end, res->flags, pr); + (u64 )res->start, (u64 )res->end, res->flags, pr);if (pr) {if (request_resource (pr, res) ==0 )continue ;@@ -307,7 +305,7 @@ reparent_resources(struct resource *parefor (p = res->child; p !=NULL ; p = p->sibling) { p->parent = res;DBG (KERN_INFO "PCI: reparented %s [%llx..%llx] under %s\n" , - p->name, p->start, p->end, res->name); + p->name, (u64 )p->start, (u64 )p->end, res->name); }return 0 ; }@@ -363,7 +361,7 @@ pci_relocate_bridge_resource(struct pci_ }if (request_resource (pr, res)) {DBG (KERN_ERR "PCI: huh? couldn't move to %llx..%llx\n" , - res->start, res->end); + (u64 )res->start, (u64 )res->end);return -1 ;/* "can't happen" */ }update_bridge_base (bus, i);@@ -481,14 +479,14 @@ static inline void alloc_resource(structstruct resource *pr, *r = &dev->resource[idx];DBG ("PCI:%s: Resource %d: %016llx-%016llx (f=%lx)\n" , -pci_name (dev), idx, r->start, r->end, r->flags); +pci_name (dev), idx, (u64 )r->start, (u64 )r->end, r->flags); pr =pci_find_parent_resource (dev, r);if (!pr ||request_resource (pr, r) <0 ) {printk (KERN_ERR "PCI: Cannot allocate resource region %d" " of device %s\n" , idx,pci_name (dev));if (pr)DBG ("PCI: parent is %p: %016llx-%016llx (f=%lx)\n" , - pr, pr->start, pr->end, pr->flags); + pr, (u64 )pr->start, (u64 )pr->end, pr->flags);/* We'll assign a new address later */ r->flags |=IORESOURCE_UNSET ; r->end -= r->start;@@ -961,7 +959,7 @@ pci_process_bridge_OF_ranges(struct pci_ res->flags =IORESOURCE_IO ; res->start = ranges[2 ];DBG ("PCI: IO 0x%llx -> 0x%llx\n" , - res->start, res->start + size -1 ); + (u64 )res->start, (u64 )res->start + size -1 );break ;case 2 :/* memory space */ memno =0 ;
arch/powerpc/kernel/pci_32.c pci_process_bridge_OF_ranges(struct pci_ · line 987
Quoted 8 lines
arch/powerpc/kernel/pci_32.c +1
-1@@ -983,7 +981,7 @@ pci_process_bridge_OF_ranges(struct pci_ res->flags |=IORESOURCE_PREFETCH ; res->start = ranges[na+2 ];DBG ("PCI: MEM[%d] 0x%llx -> 0x%llx\n" , memno, - res->start, res->start + size -1 ); + (u64 )res->start, (u64 )res->start + size -1 ); }break ; }
WBR, Sergei