Commit aabfea8d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Vasily Gorbik:

 - Fix integer overflow during stack frame unwind with invalid
   backchain.

 - Cleanup unused symbol export in zcrypt code.

 - Fix MIO addressing control activation in PCI code and expose its
   usage via sysfs.

 - Fix kernel image signature verification report presence detection.

 - Fix irq registration in vfio-ap code.

 - Add CPU measurement counters for newer machines.

 - Add base DASD thin provisioning support and code cleanups.

* tag 's390-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (21 commits)
  s390/unwind: avoid int overflow in outside_of_stack
  s390/zcrypt: remove the exporting of ap_query_configuration
  s390/pci: add mio_enabled attribute
  s390: fix setting of mio addressing control
  s390/ipl: Fix detection of has_secure attribute
  s390: vfio-ap: fix irq registration
  s390/cpumf: Add extended counter set definitions for model 8561 and 8562
  s390/dasd: Handle out-of-space constraint
  s390/dasd: Add discard support for ESE volumes
  s390/dasd: Use ALIGN_DOWN macro
  s390/dasd: Make dasd_setup_queue() a discipline function
  s390/dasd: Add new ioctl to release space
  s390/dasd: Add dasd_sleep_on_queue_interruptible()
  s390/dasd: Add missing intensity definition
  s390/dasd: Fix whitespace
  s390/dasd: Add dynamic formatting support for ESE volumes
  s390/dasd: Recognise data for ESE volumes
  s390/dasd: Put sub-order definitions in a separate section
  s390/dasd: Make layout analysis ESE compatible
  s390/dasd: Remove old defines and function
  ...
parents 7181feb9 9a159190

arch/s390/include/asm/pci_insn.h

+0 −10
Original line number Diff line number Diff line
@@ -143,14 +143,4 @@ static inline int zpci_set_irq_ctrl(u16 ctl, u8 isc) 
	return __zpci_set_irq_ctrl(ctl, isc, &iib);

}



#ifdef CONFIG_PCI

static inline void enable_mio_ctl(void)

{

	if (static_branch_likely(&have_mio))

		__ctl_set_bit(2, 5);

}

#else /* CONFIG_PCI */

static inline void enable_mio_ctl(void) {}

#endif /* CONFIG_PCI */



#endif

arch/s390/include/asm/sclp.h

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ struct sclp_info { 
	unsigned char has_gisaf : 1;

	unsigned char has_diag318 : 1;

	unsigned char has_sipl : 1;

	unsigned char has_sipl_g2 : 1;

	unsigned char has_dirq : 1;

	unsigned int ibc;

	unsigned int mtid;

arch/s390/include/uapi/asm/dasd.h

+79 −75
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ typedef struct format_data_t { 
#define DASD_FMT_INT_FMT_HA	2	/* write home address, also set FMT_R0 ! */

#define DASD_FMT_INT_INVAL	4	/* invalidate tracks */

#define DASD_FMT_INT_COMPAT	8	/* use OS/390 compatible disk layout */

#define DASD_FMT_INT_FMT_NOR0	16	/* remove permission to write record zero */

#define DASD_FMT_INT_ESE_FULL	32	/* release space for entire volume */



/*

 * struct format_check_t
@@ -322,6 +324,8 @@ struct dasd_snid_ioctl_data { 
#define BIODASDFMT     _IOW(DASD_IOCTL_LETTER,1,format_data_t)

/* Set Attributes (cache operations) */

#define BIODASDSATTR   _IOW(DASD_IOCTL_LETTER,2,attrib_data_t)

/* Release Allocated Space */

#define BIODASDRAS     _IOW(DASD_IOCTL_LETTER, 3, format_data_t)



/* Get Sense Path Group ID (SNID) data */

#define BIODASDSNID    _IOWR(DASD_IOCTL_LETTER, 1, struct dasd_snid_ioctl_data)

arch/s390/kernel/early.c

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <asm/sclp.h>

#include <asm/facility.h>

#include <asm/boot_data.h>

#include <asm/pci_insn.h>

#include "entry.h"



/*
@@ -236,7 +235,6 @@ static __init void detect_machine_facilities(void) 
		clock_comparator_max = -1ULL >> 1;

		__ctl_set_bit(0, 53);

	}

	enable_mio_ctl();

}



static inline void save_vector_registers(void)

arch/s390/kernel/ipl.c

+1 −6
Original line number Diff line number Diff line
@@ -286,12 +286,7 @@ static struct kobj_attribute sys_ipl_secure_attr = 
static ssize_t ipl_has_secure_show(struct kobject *kobj,

				   struct kobj_attribute *attr, char *page)

{

	if (MACHINE_IS_LPAR)

	return sprintf(page, "%i\n", !!sclp.has_sipl);

	else if (MACHINE_IS_VM)

		return sprintf(page, "%i\n", !!sclp.has_sipl_g2);

	else

		return sprintf(page, "%i\n", 0);

}



static struct kobj_attribute sys_ipl_has_secure_attr =

CRA Git | Maintained and supported by SUSTech CRA and CCSE