Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Martin Schwidefsky:
 "The bulk of the s390 updates for v3.14.

  New features are the perf support for the CPU-Measurement Sample
  Facility and the EP11 support for the crypto cards.  And the normal
  cleanups and bug-fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (44 commits)
  s390/cpum_sf: fix printk format warnings
  s390: Fix misspellings using 'codespell' tool
  s390/qdio: bridgeport support - CHSC part
  s390: delete new instances of __cpuinit usage
  s390/compat: fix PSW32_USER_BITS definition
  s390/zcrypt: add support for EP11 coprocessor cards
  s390/mm: optimize randomize_et_dyn for !PF_RANDOMIZE
  s390: use IS_ENABLED to check if a CONFIG is set to y or m
  s390/cio: use device_lock to synchronize calls to the ccwgroup driver
  s390/cio: use device_lock to synchronize calls to the ccw driver
  s390/cio: fix unlocked access of online member
  s390/cpum_sf: Add flag to process full SDBs only
  s390/cpum_sf: Add raw data sampling to support the diagnostic-sampling function
  s390/cpum_sf: Filter perf events based event->attr.exclude_* settings
  s390/cpum_sf: Detect KVM guest samples
  s390/cpum_sf: Add helper to read TOD from trailer entries
  s390/cpum_sf: Atomically reset trailer entry fields of sample-data-blocks
  s390/cpum_sf: Dynamically extend the sampling buffer if overflows occur
  s390/pci: reenable per default
  s390/pci/dma: fix accounting of allocated_pages
  ...
parents d8ec26d7 f85168e4

Documentation/kmsg/s390/zcrypt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*?

 * Text: "Cryptographic device %x failed and was set offline\n"

 * Severity: Error

 * Parameter:

 *   @1: device index

 * Description:

 * A cryptographic device failed to process a cryptographic request.

 * The cryptographic device driver could not correct the error and

 * set the device offline. The application that issued the

 * request received an indication that the request has failed.

 * User action:

 * Use the lszcrypt command to confirm that the cryptographic

 * hardware is still configured to your LPAR or z/VM guest virtual

 * machine. If the device is available to your Linux instance the

 * command output contains a line that begins with 'card<device index>',

 * where <device index> is the two-digit decimal number in the message text.

 * After ensuring that the device is available, use the chzcrypt command to

 * set it online again.

 * If the error persists, contact your support organization.

 */

arch/s390/include/asm/compat.h

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ 


#define PSW32_USER_BITS (PSW32_MASK_DAT | PSW32_MASK_IO | PSW32_MASK_EXT | \

			 PSW32_DEFAULT_KEY | PSW32_MASK_BASE | \

			 PSW32_MASK_MCHECK | PSW32_MASK_PSTATE | PSW32_ASC_HOME)

			 PSW32_MASK_MCHECK | PSW32_MASK_PSTATE | \

			 PSW32_ASC_PRIMARY)



#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"s390\0\0\0\0"

arch/s390/include/asm/cpu_mf.h

+181 −0
Original line number Diff line number Diff line
@@ -56,6 +56,96 @@ struct cpumf_ctr_info { 
	u32   reserved2[12];

} __packed;



/* QUERY SAMPLING INFORMATION block */

struct hws_qsi_info_block {	    /* Bit(s) */

	unsigned int b0_13:14;	    /* 0-13: zeros			 */

	unsigned int as:1;	    /* 14: basic-sampling authorization	 */

	unsigned int ad:1;	    /* 15: diag-sampling authorization	 */

	unsigned int b16_21:6;	    /* 16-21: zeros			 */

	unsigned int es:1;	    /* 22: basic-sampling enable control */

	unsigned int ed:1;	    /* 23: diag-sampling enable control	 */

	unsigned int b24_29:6;	    /* 24-29: zeros			 */

	unsigned int cs:1;	    /* 30: basic-sampling activation control */

	unsigned int cd:1;	    /* 31: diag-sampling activation control */

	unsigned int bsdes:16;	    /* 4-5: size of basic sampling entry */

	unsigned int dsdes:16;	    /* 6-7: size of diagnostic sampling entry */

	unsigned long min_sampl_rate; /* 8-15: minimum sampling interval */

	unsigned long max_sampl_rate; /* 16-23: maximum sampling interval*/

	unsigned long tear;	    /* 24-31: TEAR contents		 */

	unsigned long dear;	    /* 32-39: DEAR contents		 */

	unsigned int rsvrd0;	    /* 40-43: reserved			 */

	unsigned int cpu_speed;     /* 44-47: CPU speed 		 */

	unsigned long long rsvrd1;  /* 48-55: reserved			 */

	unsigned long long rsvrd2;  /* 56-63: reserved			 */

} __packed;



/* SET SAMPLING CONTROLS request block */

struct hws_lsctl_request_block {

	unsigned int s:1;	    /* 0: maximum buffer indicator	 */

	unsigned int h:1;	    /* 1: part. level reserved for VM use*/

	unsigned long long b2_53:52;/* 2-53: zeros			 */

	unsigned int es:1;	    /* 54: basic-sampling enable control */

	unsigned int ed:1;	    /* 55: diag-sampling enable control	 */

	unsigned int b56_61:6;	    /* 56-61: - zeros			 */

	unsigned int cs:1;	    /* 62: basic-sampling activation control */

	unsigned int cd:1;	    /* 63: diag-sampling activation control  */

	unsigned long interval;     /* 8-15: sampling interval		 */

	unsigned long tear;	    /* 16-23: TEAR contents		 */

	unsigned long dear;	    /* 24-31: DEAR contents		 */

	/* 32-63:							 */

	unsigned long rsvrd1;	    /* reserved 			 */

	unsigned long rsvrd2;	    /* reserved 			 */

	unsigned long rsvrd3;	    /* reserved 			 */

	unsigned long rsvrd4;	    /* reserved 			 */

} __packed;



struct hws_basic_entry {

	unsigned int def:16;	    /* 0-15  Data Entry Format		 */

	unsigned int R:4;	    /* 16-19 reserved			 */

	unsigned int U:4;	    /* 20-23 Number of unique instruct.  */

	unsigned int z:2;	    /* zeros				 */

	unsigned int T:1;	    /* 26 PSW DAT mode			 */

	unsigned int W:1;	    /* 27 PSW wait state		 */

	unsigned int P:1;	    /* 28 PSW Problem state		 */

	unsigned int AS:2;	    /* 29-30 PSW address-space control	 */

	unsigned int I:1;	    /* 31 entry valid or invalid	 */

	unsigned int:16;

	unsigned int prim_asn:16;   /* primary ASN			 */

	unsigned long long ia;	    /* Instruction Address		 */

	unsigned long long gpp;     /* Guest Program Parameter		 */

	unsigned long long hpp;     /* Host Program Parameter		 */

} __packed;



struct hws_diag_entry {

	unsigned int def:16;	    /* 0-15  Data Entry Format		 */

	unsigned int R:14;	    /* 16-19 and 20-30 reserved		 */

	unsigned int I:1;	    /* 31 entry valid or invalid	 */

	u8	     data[];	    /* Machine-dependent sample data	 */

} __packed;



struct hws_combined_entry {

	struct hws_basic_entry	basic;	/* Basic-sampling data entry */

	struct hws_diag_entry	diag;	/* Diagnostic-sampling data entry */

} __packed;



struct hws_trailer_entry {

	union {

		struct {

			unsigned int f:1;	/* 0 - Block Full Indicator   */

			unsigned int a:1;	/* 1 - Alert request control  */

			unsigned int t:1;	/* 2 - Timestamp format	      */

			unsigned long long:61;	/* 3 - 63: Reserved	      */

		};

		unsigned long long flags;	/* 0 - 63: All indicators     */

	};

	unsigned long long overflow;	 /* 64 - sample Overflow count	      */

	unsigned char timestamp[16];	 /* 16 - 31 timestamp		      */

	unsigned long long reserved1;	 /* 32 -Reserved		      */

	unsigned long long reserved2;	 /*				      */

	unsigned long long progusage1;	 /* 48 - reserved for programming use */

	unsigned long long progusage2;	 /*				      */

} __packed;



/* Query counter information */

static inline int qctri(struct cpumf_ctr_info *info)

{
@@ -99,4 +189,95 @@ static inline int ecctr(u64 ctr, u64 *val) 
	return cc;

}



/* Query sampling information */

static inline int qsi(struct hws_qsi_info_block *info)

{

	int cc;

	cc = 1;



	asm volatile(

		"0:	.insn	s,0xb2860000,0(%1)\n"

		"1:	lhi	%0,0\n"

		"2:\n"

		EX_TABLE(0b, 2b) EX_TABLE(1b, 2b)

		: "=d" (cc), "+a" (info)

		: "m" (*info)

		: "cc", "memory");



	return cc ? -EINVAL : 0;

}



/* Load sampling controls */

static inline int lsctl(struct hws_lsctl_request_block *req)

{

	int cc;



	cc = 1;

	asm volatile(

		"0:	.insn	s,0xb2870000,0(%1)\n"

		"1:	ipm	%0\n"

		"	srl	%0,28\n"

		"2:\n"

		EX_TABLE(0b, 2b) EX_TABLE(1b, 2b)

		: "+d" (cc), "+a" (req)

		: "m" (*req)

		: "cc", "memory");



	return cc ? -EINVAL : 0;

}



/* Sampling control helper functions */



#include <linux/time.h>



static inline unsigned long freq_to_sample_rate(struct hws_qsi_info_block *qsi,

						unsigned long freq)

{

	return (USEC_PER_SEC / freq) * qsi->cpu_speed;

}



static inline unsigned long sample_rate_to_freq(struct hws_qsi_info_block *qsi,

						unsigned long rate)

{

	return USEC_PER_SEC * qsi->cpu_speed / rate;

}



#define SDB_TE_ALERT_REQ_MASK	0x4000000000000000UL

#define SDB_TE_BUFFER_FULL_MASK 0x8000000000000000UL



/* Return TOD timestamp contained in an trailer entry */

static inline unsigned long long trailer_timestamp(struct hws_trailer_entry *te)

{

	/* TOD in STCKE format */

	if (te->t)

		return *((unsigned long long *) &te->timestamp[1]);



	/* TOD in STCK format */

	return *((unsigned long long *) &te->timestamp[0]);

}



/* Return pointer to trailer entry of an sample data block */

static inline unsigned long *trailer_entry_ptr(unsigned long v)

{

	void *ret;



	ret = (void *) v;

	ret += PAGE_SIZE;

	ret -= sizeof(struct hws_trailer_entry);



	return (unsigned long *) ret;

}



/* Return if the entry in the sample data block table (sdbt)

 * is a link to the next sdbt */

static inline int is_link_entry(unsigned long *s)

{

	return *s & 0x1ul ? 1 : 0;

}



/* Return pointer to the linked sdbt */

static inline unsigned long *get_next_sdbt(unsigned long *s)

{

	return (unsigned long *) (*s & ~0x1ul);

}

#endif /* _ASM_S390_CPU_MF_H */

arch/s390/include/asm/css_chars.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ struct css_general_char { 
	u32 fcx : 1;	 /* bit 88 */

	u32 : 19;

	u32 alt_ssi : 1; /* bit 108 */

	u32:1;

	u32 narf:1;	 /* bit 110 */

} __packed;



extern struct css_general_char css_general_characteristics;

arch/s390/include/asm/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ int clp_disable_fh(struct zpci_dev *); 
void zpci_event_error(void *);

void zpci_event_availability(void *);

void zpci_rescan(void);

bool zpci_is_enabled(void);

#else /* CONFIG_PCI */

static inline void zpci_event_error(void *e) {}

static inline void zpci_event_availability(void *e) {}