Commit c5f564ec authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by sanglipeng1
Browse files

s390: use the correct count for __iowrite64_copy() 

stable inclusion
from stable-v5.10.211
commit 5d4e4eff791dd88267674284f0a5a4557ee96416
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAF2J4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5d4e4eff791dd88267674284f0a5a4557ee96416



--------------------------------

[ 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: 87bc359b ("s390/pci: speed up __iowrite64_copy by using pci store block insn")
Acked-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/0-v1-9223d11a7662+1d7785-s390_iowrite64_jgg@nvidia.com


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 874889ab

arch/s390/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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)