diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2024-02-16 20:48:14 -0400 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2024-02-21 15:07:46 +0100 |
| commit | 723a2cc8d69d4342b47dfddbfe6c19f1b135f09b (patch) | |
| tree | 491c908b186057e03ae0ad087a42c1faab6407ff | |
| parent | 124468af7e769a52d27c3290007ac6e2ba346ccd (diff) | |
| download | linux-723a2cc8d69d4342b47dfddbfe6c19f1b135f09b.tar.gz | |
s390: use the correct count for __iowrite64_copy()
The signature for __iowrite64_copy() requires the number of 64 bit
quantities, not bytes. Multiple by 8 to get to a byte length before
invoking zpci_memcpy_toio()
Fixes: 87bc359b9822 ("s390/pci: speed up __iowrite64_copy by using pci store block insn")
Acked-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/0-v1-9223d11a7662+1d7785-s390_iowrite64_jgg@nvidia.com
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Notes
Fixes: 87bc359b9822 ("s390/pci: speed up __iowrite64_copy by using pci store block insn") # v3.8-rc1
Stable: ef6566d10cf7 # v6.6.19
Stable: 11277d189267 # v6.1.80
Stable: 39603a6d4e71 # v5.15.150
Stable: 5d4e4eff791d # v5.10.211
Stable: 06de2302549f # v5.4.270
Stable: 2b505745a91e # v4.19.308
Lore: https://lore.kernel.org/r/0-v1-9223d11a7662+1d7785-s390_iowrite64_jgg@nvidia.com # linux-patches, linux-s390
Lore: https://lore.kernel.org/r/20240227131550.080328801@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131555.343296328@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131602.336458681@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131615.826081545@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131622.563852824@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131634.189771997@linuxfoundation.org # linux-patches, stable
Lore: https://lore.kernel.org/r/20240227131640.689639906@linuxfoundation.org # linux-patches, stable
| -rw-r--r-- | arch/s390/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 676ac74026a82..52a44e353796c 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -252,7 +252,7 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, /* combine single writes by using store-block insn */ void __iowrite64_copy(void __iomem *to, const void *from, size_t count) { - zpci_memcpy_toio(to, from, count); + zpci_memcpy_toio(to, from, count * 8); } void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, |