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

Commit 226572b1 authored by Joe Schultz's avatar Joe Schultz Committed by Greg Kroah-Hartman
Browse files

vme_tsi148: Fix PCI address mapping assumption 



Previously, tsi148_master_set() assumed the address contained in its
PCI bus resource represented the actual PCI bus address. This is a fine
assumption on some platforms. However, on platforms that don't use a
1:1 (CPU:PCI) mapping this results in the tsi148 driver configuring an
invalid master window translation.

This patch updates the vme_tsi148 driver to first convert the address
contained in the PCI bus resource into a PCI bus address before using
it.

[asierra: account for pcibios_resource_to_bus() prototype change]
Signed-off-by: default avatarJoe Schultz <jschultz@xes-inc.com>
Signed-off-by: default avatarAaron Sierra <asierra@xes-inc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 098ced8f

drivers/vme/bridges/vme_tsi148.c

+7 −1
Original line number Diff line number Diff line
@@ -910,11 +910,15 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, 
	unsigned long long pci_bound, vme_offset, pci_base;

	struct vme_bridge *tsi148_bridge;

	struct tsi148_driver *bridge;

	struct pci_bus_region region;

	struct pci_dev *pdev;



	tsi148_bridge = image->parent;



	bridge = tsi148_bridge->driver_priv;



	pdev = container_of(tsi148_bridge->parent, struct pci_dev, dev);



	/* Verify input data */

	if (vme_base & 0xFFFF) {

		dev_err(tsi148_bridge->parent, "Invalid VME Window "
@@ -949,7 +953,9 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, 
		pci_bound = 0;

		vme_offset = 0;

	} else {

		pci_base = (unsigned long long)image->bus_resource.start;

		pcibios_resource_to_bus(pdev->bus, &region,

					&image->bus_resource);

		pci_base = region.start;



		/*

		 * Bound address is a valid address for the window, adjust