diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-24 13:47:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-24 13:47:27 -0700 |
| commit | 13209a8f7304a34158f4366e8ea07a1965c05ac7 (patch) | |
| tree | f25ba4846fe02a32d4a14ef1a6be3227363da919 /arch/s390/include | |
| parent | 316107119f473e764cf5e50437333c8b83bec0da (diff) | |
| parent | 98790bbac4db1697212ce9462ec35ca09c4a2810 (diff) | |
| download | linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the
register accesses are done slightly differently in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/pci_io.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h index cd060b5dd8fd..e4dc64cc9c55 100644 --- a/arch/s390/include/asm/pci_io.h +++ b/arch/s390/include/asm/pci_io.h @@ -8,6 +8,10 @@ #include <linux/slab.h> #include <asm/pci_insn.h> +/* I/O size constraints */ +#define ZPCI_MAX_READ_SIZE 8 +#define ZPCI_MAX_WRITE_SIZE 128 + /* I/O Map */ #define ZPCI_IOMAP_SHIFT 48 #define ZPCI_IOMAP_ADDR_BASE 0x8000000000000000UL @@ -140,7 +144,8 @@ static inline int zpci_memcpy_fromio(void *dst, while (n > 0) { size = zpci_get_max_write_size((u64 __force) src, - (u64) dst, n, 8); + (u64) dst, n, + ZPCI_MAX_READ_SIZE); rc = zpci_read_single(dst, src, size); if (rc) break; @@ -161,7 +166,8 @@ static inline int zpci_memcpy_toio(volatile void __iomem *dst, while (n > 0) { size = zpci_get_max_write_size((u64 __force) dst, - (u64) src, n, 128); + (u64) src, n, + ZPCI_MAX_WRITE_SIZE); if (size > 8) /* main path */ rc = zpci_write_block(dst, src, size); else |