aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bogendoerfer2017-08-12 16:36:47 -0500
committerGreg Kroah-Hartman2017-08-24 19:02:35 -0500
commit04f4f73ffe9383921794b833346911bd1e19b228 (patch)
tree081c274ba58dab7c39ff307743d4540460a5d5bf
parentea088172692cbadddc4efcdae2a5dfe1693e8b20 (diff)
downloadkernel-omap-04f4f73ffe9383921794b833346911bd1e19b228.tar.gz
kernel-omap-04f4f73ffe9383921794b833346911bd1e19b228.tar.xz
kernel-omap-04f4f73ffe9383921794b833346911bd1e19b228.zip
parisc: pci memory bar assignment fails with 64bit kernels on dino/cujo
commit 4098116039911e8870d84c975e2ec22dab65a909 upstream. For 64bit kernels the lmmio_space_offset of the host bridge window isn't set correctly on systems with dino/cujo PCI host bridges. This leads to not assigned memory bars and failing drivers, which need to use these bars. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Acked-by: Helge Deller <deller@gmx.de> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/parisc/dino.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 7b0ca1551d7b..005ea632ba53 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -954,7 +954,7 @@ static int __init dino_probe(struct parisc_device *dev)
954 954
955 dino_dev->hba.dev = dev; 955 dino_dev->hba.dev = dev;
956 dino_dev->hba.base_addr = ioremap_nocache(hpa, 4096); 956 dino_dev->hba.base_addr = ioremap_nocache(hpa, 4096);
957 dino_dev->hba.lmmio_space_offset = 0; /* CPU addrs == bus addrs */ 957 dino_dev->hba.lmmio_space_offset = PCI_F_EXTEND;
958 spin_lock_init(&dino_dev->dinosaur_pen); 958 spin_lock_init(&dino_dev->dinosaur_pen);
959 dino_dev->hba.iommu = ccio_get_iommu(dev); 959 dino_dev->hba.iommu = ccio_get_iommu(dev);
960 960