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

Commit 43c34735 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

[PATCH] pci and yenta: pcibios_bus_to_resource 



In yenta_socket, we default to using the resource setting of the CardBus
bridge.  However, this is a PCI-bus-centric view of resources and thus needs
to be converted to generic resources first.  Therefore, add a call to
pcibios_bus_to_resource() call in between.  This function is a mere wrapper on
x86 and friends, however on some others it already exists, is added in this
patch (alpha, arm, ppc, ppc64) or still needs to be provided (parisc -- where
is its pcibios_resource_to_bus() ?).

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fec59a71

arch/alpha/kernel/pci.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -350,8 +350,24 @@ pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, 
	region->end = res->end - offset;

	region->end = res->end - offset;

}

}





void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			     struct pci_bus_region *region)

{

	struct pci_controller *hose = (struct pci_controller *)dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = hose->io_space->start;

	else if (res->flags & IORESOURCE_MEM)

		offset = hose->mem_space->start;



	res->start = region->start + offset;

	res->end = region->end + offset;

}



#ifdef CONFIG_HOTPLUG

#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_bus_to_resource);

#endif

#endif





int

int

arch/arm/kernel/bios32.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -447,9 +447,26 @@ pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, 
	region->end   = res->end - offset;

	region->end   = res->end - offset;

}

}





void __devinit

pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			struct pci_bus_region *region)

{

	struct pci_sys_data *root = dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = root->io_offset;

	if (res->flags & IORESOURCE_MEM)

		offset = root->mem_offset;



	res->start = region->start + offset;

	res->end   = region->end + offset;

}



#ifdef CONFIG_HOTPLUG

#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_fixup_bus);

EXPORT_SYMBOL(pcibios_fixup_bus);

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_bus_to_resource);

#endif

#endif





/*

/*

arch/ppc/kernel/pci.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -160,6 +160,21 @@ void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, 
}

}

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_resource_to_bus);





void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			     struct pci_bus_region *region)

{

	unsigned long offset = 0;

	struct pci_controller *hose = dev->sysdata;



	if (hose && res->flags & IORESOURCE_IO)

		offset = (unsigned long)hose->io_base_virt - isa_io_base;

	else if (hose && res->flags & IORESOURCE_MEM)

		offset = hose->pci_mem_offset;

	res->start = region->start + offset;

	res->end = region->end + offset;

}

EXPORT_SYMBOL(pcibios_bus_to_resource);



/*

/*

 * We need to avoid collisions with `mirrored' VGA ports

 * We need to avoid collisions with `mirrored' VGA ports

 * and other strange ISA hardware, so we always want the

 * and other strange ISA hardware, so we always want the

arch/ppc64/kernel/pci.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -108,8 +108,28 @@ void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region 
	region->end = res->end - offset;

	region->end = res->end - offset;

}

}





void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			      struct pci_bus_region *region)

{

	unsigned long offset = 0;

	struct pci_controller *hose = pci_bus_to_host(dev->bus);



	if (!hose)

		return;



	if (res->flags & IORESOURCE_IO)

	        offset = (unsigned long)hose->io_base_virt - pci_io_base;



	if (res->flags & IORESOURCE_MEM)

		offset = hose->pci_mem_offset;



	res->start = region->start + offset;

	res->end = region->end + offset;

}



#ifdef CONFIG_HOTPLUG

#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_bus_to_resource);

#endif

#endif





/*

/*

drivers/pcmcia/yenta_socket.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -605,9 +605,8 @@ static int yenta_search_res(struct yenta_socket *socket, struct resource *res, 




static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type, int addr_start, int addr_end)

static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type, int addr_start, int addr_end)

{

{

	struct pci_bus *bus;

	struct resource *root, *res;

	struct resource *root, *res;

	u32 start, end;

	struct pci_bus_region region;

	unsigned mask;

	unsigned mask;





	res = socket->dev->resource + PCI_BRIDGE_RESOURCES + nr;

	res = socket->dev->resource + PCI_BRIDGE_RESOURCES + nr;
@@ -620,15 +619,13 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ 
	if (type & IORESOURCE_IO)

	if (type & IORESOURCE_IO)

		mask = ~3;

		mask = ~3;





	bus = socket->dev->subordinate;

	res->name = socket->dev->subordinate->name;

	res->name = bus->name;

	res->flags = type;

	res->flags = type;





	start = config_readl(socket, addr_start) & mask;

	region.start = config_readl(socket, addr_start) & mask;

	end = config_readl(socket, addr_end) | ~mask;

	region.end = config_readl(socket, addr_end) | ~mask;

	if (start && end > start && !override_bios) {

	if (region.start && region.end > region.start && !override_bios) {

		res->start = start;

		pcibios_bus_to_resource(socket->dev, res, &region);

		res->end = end;

		root = pci_find_parent_resource(socket->dev, res);

		root = pci_find_parent_resource(socket->dev, res);

		if (root && (request_resource(root, res) == 0))

		if (root && (request_resource(root, res) == 0))

			return;

			return;