Attachment #27093 for bug #16263

Lines 184-189 static void __init pcibios_allocate_resources(int pass) Link Here

(-)a/arch/x86/pci/i386.c (+1 lines)
184	idx, r, disabled, pass);	184	idx, r, disabled, pass);
185	if (pci_claim_resource(dev, idx) < 0) {	185	if (pci_claim_resource(dev, idx) < 0) {
186	/* We'll assign a new address later */	186	/* We'll assign a new address later */
		187	dev->bios_addr[idx] = r->start;
187	r->end -= r->start;	188	r->end -= r->start;
188	r->start = 0;	189	r->start = 0;
189	}	190	}




					     pcibios_align_resource, dev);
	}

	if (ret < 0 && dev->bios_addr[resno]) {
		struct resource *root, *conflict;
		resource_size_t start, end;

		if (res->flags & IORESOURCE_IO)
			root = &ioport_resource;
		else
			root = &iomem_resource;

		start = res->start;
		end = res->end;
		res->start = dev->bios_addr[resno];
		res->end = res->start + size;
		conflict = request_resource_conflict(root, res);
		if (conflict) {
			dev_info(&dev->dev,
				 "BAR %d: firmware assignment %pR conflicts "
				 "with %s %pR\n", resno, res,
				 conflict->name, conflict);
			res->start = start;
			res->end = end;
		} else {
			dev_info(&dev->dev,
				 "BAR %d: trying firmware assignment %pR\n",
				 resno, res);
			ret = 0;
		}
	}

	if (!ret) {
		res->flags &= ~IORESOURCE_STARTALIGN;
		dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res);

Lines 288-293 struct pci_dev { Link Here

(-)a/include/linux/pci.h (+1 lines)
288	*/	288	*/
289	unsigned int irq;	289	unsigned int irq;
290	struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */	290	struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
		291	resource_size_t bios_addr[DEVICE_COUNT_RESOURCE]; /* FW-assigned addr */
291		292
292	/* These fields are used by common fixups */	293	/* These fields are used by common fixups */
293	unsigned int transparent:1; /* Transparent PCI bridge */	294	unsigned int transparent:1; /* Transparent PCI bridge */

Return to bug 16263

Lines 156-161 static int __pci_assign_resource(struct pci_bus bus, struct pci_dev dev, Link Here

(-)a/drivers/pci/setup-res.c (+29 lines)
156	pcibios_align_resource, dev);	156	pcibios_align_resource, dev);
157	}	157	}
158		158
		159	if (ret < 0 && dev->bios_addr[resno]) {
		160	struct resource root, conflict;
		161	resource_size_t start, end;
		162
		163	if (res->flags & IORESOURCE_IO)
		164	root = &ioport_resource;
		165	else
		166	root = &iomem_resource;
		167
		168	start = res->start;
		169	end = res->end;
		170	res->start = dev->bios_addr[resno];
		171	res->end = res->start + size;
		172	conflict = request_resource_conflict(root, res);
		173	if (conflict) {
		174	dev_info(&dev->dev,
		175	"BAR %d: firmware assignment %pR conflicts "
		176	"with %s %pR\n", resno, res,
		177	conflict->name, conflict);
		178	res->start = start;
		179	res->end = end;
		180	} else {
		181	dev_info(&dev->dev,
		182	"BAR %d: trying firmware assignment %pR\n",
		183	resno, res);
		184	ret = 0;
		185	}
		186	}
		187
159	if (!ret) {	188	if (!ret) {
160	res->flags &= ~IORESOURCE_STARTALIGN;	189	res->flags &= ~IORESOURCE_STARTALIGN;
161	dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res);	190	dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res);