Commit 5efa18e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-6.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Heiko Carstens:

 - Fix invalid -EBUSY on ccw_device_start() which can lead to failing
   device initialization

 - Add missing multiplication by 8 in __iowrite64_copy() to get the
   correct byte length before calling zpci_memcpy_toio()

 - Various config updates

* tag 's390-6.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/cio: fix invalid -EBUSY on ccw_device_start
  s390: use the correct count for __iowrite64_copy()
  s390/configs: update default configurations
  s390/configs: enable INIT_STACK_ALL_ZERO in all configurations
  s390/configs: provide compat topic configuration target
parents 95e73fb1 5ef1dc40

arch/s390/configs/compat.config

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# Help: Enable compat support

CONFIG_COMPAT=y

CONFIG_COMPAT_32BIT_TIME=y

arch/s390/configs/debug_defconfig

+1 −7
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ CONFIG_UNIX=y 
CONFIG_UNIX_DIAG=m

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y
@@ -374,6 +373,7 @@ CONFIG_NET_ACT_POLICE=m 
CONFIG_NET_ACT_GACT=m

CONFIG_GACT_PROB=y

CONFIG_NET_ACT_MIRRED=m

CONFIG_NET_ACT_IPT=m

CONFIG_NET_ACT_NAT=m

CONFIG_NET_ACT_PEDIT=m

CONFIG_NET_ACT_SIMP=m
@@ -436,9 +436,6 @@ CONFIG_SCSI_DH_ALUA=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_MD_CLUSTER=m

CONFIG_BCACHE=m

CONFIG_BLK_DEV_DM=y
@@ -637,7 +634,6 @@ CONFIG_FUSE_FS=y 
CONFIG_CUSE=m

CONFIG_VIRTIO_FS=m

CONFIG_OVERLAY_FS=m

CONFIG_NETFS_SUPPORT=m

CONFIG_NETFS_STATS=y

CONFIG_FSCACHE=y

CONFIG_CACHEFILES=m
@@ -709,7 +705,6 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y 
CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

CONFIG_INIT_STACK_NONE=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -739,7 +734,6 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

arch/s390/configs/defconfig

+1 −8
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ CONFIG_UNIX=y 
CONFIG_UNIX_DIAG=m

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y
@@ -364,6 +363,7 @@ CONFIG_NET_ACT_POLICE=m 
CONFIG_NET_ACT_GACT=m

CONFIG_GACT_PROB=y

CONFIG_NET_ACT_MIRRED=m

CONFIG_NET_ACT_IPT=m

CONFIG_NET_ACT_NAT=m

CONFIG_NET_ACT_PEDIT=m

CONFIG_NET_ACT_SIMP=m
@@ -426,9 +426,6 @@ CONFIG_SCSI_DH_ALUA=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_MD_CLUSTER=m

CONFIG_BCACHE=m

CONFIG_BLK_DEV_DM=y
@@ -622,7 +619,6 @@ CONFIG_FUSE_FS=y 
CONFIG_CUSE=m

CONFIG_VIRTIO_FS=m

CONFIG_OVERLAY_FS=m

CONFIG_NETFS_SUPPORT=m

CONFIG_NETFS_STATS=y

CONFIG_FSCACHE=y

CONFIG_CACHEFILES=m
@@ -693,7 +689,6 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y 
CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

CONFIG_INIT_STACK_NONE=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CRYPTO_FIPS=y

CONFIG_CRYPTO_USER=m
@@ -724,11 +719,9 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

arch/s390/configs/zfcpdump_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y 
# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KEXEC=y

CONFIG_CRASH_DUMP=y

CONFIG_MARCH_Z13=y

CONFIG_NR_CPUS=2
@@ -64,7 +65,6 @@ CONFIG_ZFCP=y 
# CONFIG_MISC_FILESYSTEMS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_LSM="yama,loadpin,safesetid,integrity"

CONFIG_INIT_STACK_NONE=y

# CONFIG_ZLIB_DFLTCC is not set

CONFIG_XZ_DEC_MICROLZMA=y

CONFIG_PRINTK_TIME=y

arch/s390/pci/pci.c

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