Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 872455e2 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Paul Mackerras
Browse files

[POWERPC] 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 685143ac)
which broke it for the plain vanilla 32-bit resources...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent f8485350

arch/powerpc/kernel/pci_32.c

+11 −13
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ pcibios_fixup_resources(struct pci_dev *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 *dev) 
		if (offset != 0) {

			res->start += offset;

			res->end += offset;

#ifdef DEBUG

			printk("Fixup res %d (%lx) of dev %s: %llx -> %llx\n",

			DBG("Fixup res %d (%lx) of dev %s: %llx -> %llx\n",

			    i, res->flags, pci_name(dev),

			       res->start - offset, res->start);

#endif

			    (u64)res->start - offset, (u64)res->start);

		}

	}
@@ -256,7 +254,7 @@ pcibios_allocate_bus_resources(struct list_head *bus_list) 
			}



			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 *parent, struct resource *res) 
	for (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_bus *bus, int i) 
	}

	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(struct pci_dev *dev, int idx) 
	struct 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_controller *hose, 
			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_controller *hose, 
					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;

		}