s390 patches for 4.6-rc5

GIT PULL Martin Schwidefsky 1 participant 1 message Apr 18, 2016

Subsystems (2)

s390 s390 SCM driver

lore

Share & tools

lore

Martin Schwidefsky

author

2016-04-18 07:48 UTC #0 lore raw

Hi Linus,

please pull from the 'for-linus' branch of

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus

to receive the following updates:

A couple of bug fixes.

Gerald Schaefer (1):
s390/dcssblk: fix possible deadlock in remove vs. per-device attributes

Heiko Carstens (2):
s390/spinlock: avoid yield to non existent cpu
s390: add CPU_BIG_ENDIAN config option

Sebastian Ott (2):
s390/scm_blk: fix deadlock for requests != REQ_TYPE_FS s390/pci: add extra padding to function measurement block

Sudip Mukherjee (1):
s390/seccomp: include generic seccomp header file

 arch/s390/Kconfig               | 3 +++
 arch/s390/include/asm/pci.h     | 3 ++-
 arch/s390/include/asm/seccomp.h | 2 ++
 arch/s390/lib/spinlock.c        | 1 +
 drivers/s390/block/dcssblk.c    | 5 +++--
 drivers/s390/block/scm_blk.c    | 2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)

arch/s390/Kconfig +3 -0

index aad23e3..bf24ab1 100644
@@ -4,6 +4,9 @@ config MMU
 config ZONE_DMA
 	def_bool y
 
+config CPU_BIG_ENDIAN
+	def_bool y
+
 config LOCKDEP_SUPPORT
 	def_bool y

arch/s390/include/asm/pci.h +2 -1

index b6bfa16..535a46d 100644
@@ -44,7 +44,8 @@ struct zpci_fmb {
 	u64 rpcit_ops;
 	u64 dma_rbytes;
 	u64 dma_wbytes;
-} __packed __aligned(64);
+	u64 pad[2];
+} __packed __aligned(128);
 
 enum zpci_state {
 	ZPCI_FN_STATE_RESERVED,

arch/s390/include/asm/seccomp.h +2 -0

index 781a9cf..e10f833 100644
@@ -13,4 +13,6 @@
 #define __NR_seccomp_exit_32	__NR_exit
 #define __NR_seccomp_sigreturn_32 __NR_sigreturn
 
+#include <asm-generic/seccomp.h>
+
 #endif	/* _ASM_S390_SECCOMP_H */

arch/s390/lib/spinlock.c +1 -0

index d4549c9..e5f50a7 100644
@@ -105,6 +105,7 @@ void arch_spin_lock_wait_flags(arch_spinlock_t *lp, unsigned long flags)
 			if (_raw_compare_and_swap(&lp->lock, 0, cpu))
 				return;
 			local_irq_restore(flags);
+			continue;
 		}
 		/* Check if the lock owner is running. */
 		if (first_diag && cpu_is_preempted(~owner)) {

drivers/s390/block/dcssblk.c +3 -2

index 1bce9cf..b839086 100644
@@ -756,15 +756,16 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch
 	blk_cleanup_queue(dev_info->dcssblk_queue);
 	dev_info->gd->queue = NULL;
 	put_disk(dev_info->gd);
-	device_unregister(&dev_info->dev);
 
 	/* unload all related segments */
 	list_for_each_entry(entry, &dev_info->seg_list, lh)
 		segment_unload(entry->segment_name);
 
-	put_device(&dev_info->dev);
 	up_write(&dcssblk_devices_sem);
 
+	device_unregister(&dev_info->dev);
+	put_device(&dev_info->dev);
+
 	rc = count;
 out_buf:
 	kfree(local_buf);

drivers/s390/block/scm_blk.c +1 -1

index 75d9896..e6f54d3 100644
@@ -303,7 +303,7 @@ static void scm_blk_request(struct request_queue *rq)
 		if (req->cmd_type != REQ_TYPE_FS) {
 			blk_start_request(req);
 			blk_dump_rq_flags(req, KMSG_COMPONENT " bad request");
-			blk_end_request_all(req, -EIO);
+			__blk_end_request_all(req, -EIO);
 			continue;
 		}