summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJason Gunthorpe <jgg@nvidia.com>2024-02-16 20:48:14 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-03-01 13:16:50 +0100
commit5d4e4eff791dd88267674284f0a5a4557ee96416 (patch)
treeffa4925679024e18fc76acab0c6e84ef5849a355 /arch
parentf6ce90567ed373b6be96a033fda73cd769f5c748 (diff)
downloadlinux-stable-5d4e4eff791dd88267674284f0a5a4557ee96416.tar.gz
linux-stable-5d4e4eff791dd88267674284f0a5a4557ee96416.tar.bz2
linux-stable-5d4e4eff791dd88267674284f0a5a4557ee96416.zip
s390: use the correct count for __iowrite64_copy()
[ Upstream commit 723a2cc8d69d4342b47dfddbfe6c19f1b135f09b ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 74799439b259..beecc36c3027 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -225,7 +225,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);
}
static void __iomem *__ioremap(phys_addr_t addr, size_t size, pgprot_t prot)