Commit df057c91 authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Vasily Gorbik

s390/pci: Fix unexpected write combine on resource

In the initial MIO support introduced in

commit 71ba41c9 ("s390/pci: provide support for MIO instructions")

zpci_map_resource() and zpci_setup_resources() default to using the
mio_wb address as the resource's start address. This means users of the
mapping, which includes most drivers, will get write combining on PCI
Stores. This may lead to problems when drivers expect write through
behavior when not using an explicit ioremap_wc().

Cc: stable@vger.kernel.org
Fixes: 71ba41c9 ("s390/pci: provide support for MIO instructions")
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 582b4e55
...@@ -424,7 +424,7 @@ static void zpci_map_resources(struct pci_dev *pdev) ...@@ -424,7 +424,7 @@ static void zpci_map_resources(struct pci_dev *pdev)
if (zpci_use_mio(zdev)) if (zpci_use_mio(zdev))
pdev->resource[i].start = pdev->resource[i].start =
(resource_size_t __force) zdev->bars[i].mio_wb; (resource_size_t __force) zdev->bars[i].mio_wt;
else else
pdev->resource[i].start = (resource_size_t __force) pdev->resource[i].start = (resource_size_t __force)
pci_iomap_range_fh(pdev, i, 0, 0); pci_iomap_range_fh(pdev, i, 0, 0);
...@@ -531,7 +531,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev, ...@@ -531,7 +531,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev,
flags |= IORESOURCE_MEM_64; flags |= IORESOURCE_MEM_64;
if (zpci_use_mio(zdev)) if (zpci_use_mio(zdev))
addr = (unsigned long) zdev->bars[i].mio_wb; addr = (unsigned long) zdev->bars[i].mio_wt;
else else
addr = ZPCI_ADDR(entry); addr = ZPCI_ADDR(entry);
size = 1UL << zdev->bars[i].size; size = 1UL << zdev->bars[i].size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment