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

Commit 6aaf05f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] topology: fix topology on z10 machines
  [S390] crypto: avoid MSA3 and MSA4 instructions in ESA mode
  [S390] avoid STCKF if running in ESA mode
  [S390] zfcpdump: Do not initialize zfcpdump in kdump mode
  [S390] ap: Setup processing for messages in request queue.
  [S390] Kconfig: Select CONFIG_KEXEC for CONFIG_CRASH_DUMP
  [S390] incorrect note program header
  [S390] pfault: ignore leftover completion interrupts
  [S390] fix pgste update logic
  [S390] wire up process_vm syscalls
parents ff0ff780 f6bf1a8a

arch/s390/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -572,6 +572,7 @@ config KEXEC 
config CRASH_DUMP

config CRASH_DUMP

	bool "kernel crash dumps"

	bool "kernel crash dumps"

	depends on 64BIT

	depends on 64BIT

	select KEXEC

	help

	help

	  Generate crash dump after being started by kexec.

	  Generate crash dump after being started by kexec.

	  Crash dump kernels are loaded in the main kernel with kexec-tools

	  Crash dump kernels are loaded in the main kernel with kexec-tools

arch/s390/crypto/crypt_s390.h

+5 −2
Original line number Original line Diff line number Diff line
@@ -368,9 +368,12 @@ static inline int crypt_s390_func_available(int func, 




	if (facility_mask & CRYPT_S390_MSA && !test_facility(17))

	if (facility_mask & CRYPT_S390_MSA && !test_facility(17))

		return 0;

		return 0;

	if (facility_mask & CRYPT_S390_MSA3 && !test_facility(76))



	if (facility_mask & CRYPT_S390_MSA3 &&

	    (!test_facility(2) || !test_facility(76)))

		return 0;

		return 0;

	if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77))

	if (facility_mask & CRYPT_S390_MSA4 &&

	    (!test_facility(2) || !test_facility(77)))

		return 0;

		return 0;





	switch (func & CRYPT_S390_OP_MASK) {

	switch (func & CRYPT_S390_OP_MASK) {

arch/s390/include/asm/pgtable.h

+9 −3
Original line number Original line Diff line number Diff line
@@ -593,6 +593,8 @@ static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste) 
	unsigned long address, bits;

	unsigned long address, bits;

	unsigned char skey;

	unsigned char skey;





	if (!pte_present(*ptep))

		return pgste;

	address = pte_val(*ptep) & PAGE_MASK;

	address = pte_val(*ptep) & PAGE_MASK;

	skey = page_get_storage_key(address);

	skey = page_get_storage_key(address);

	bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);

	bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);
@@ -625,6 +627,8 @@ static inline pgste_t pgste_update_young(pte_t *ptep, pgste_t pgste) 
#ifdef CONFIG_PGSTE

#ifdef CONFIG_PGSTE

	int young;

	int young;





	if (!pte_present(*ptep))

		return pgste;

	young = page_reset_referenced(pte_val(*ptep) & PAGE_MASK);

	young = page_reset_referenced(pte_val(*ptep) & PAGE_MASK);

	/* Transfer page referenced bit to pte software bit (host view) */

	/* Transfer page referenced bit to pte software bit (host view) */

	if (young || (pgste_val(pgste) & RCP_HR_BIT))

	if (young || (pgste_val(pgste) & RCP_HR_BIT))
@@ -638,13 +642,15 @@ static inline pgste_t pgste_update_young(pte_t *ptep, pgste_t pgste) 




}

}





static inline void pgste_set_pte(pte_t *ptep, pgste_t pgste)

static inline void pgste_set_pte(pte_t *ptep, pgste_t pgste, pte_t entry)

{

{

#ifdef CONFIG_PGSTE

#ifdef CONFIG_PGSTE

	unsigned long address;

	unsigned long address;

	unsigned long okey, nkey;

	unsigned long okey, nkey;





	address = pte_val(*ptep) & PAGE_MASK;

	if (!pte_present(entry))

		return;

	address = pte_val(entry) & PAGE_MASK;

	okey = nkey = page_get_storage_key(address);

	okey = nkey = page_get_storage_key(address);

	nkey &= ~(_PAGE_ACC_BITS | _PAGE_FP_BIT);

	nkey &= ~(_PAGE_ACC_BITS | _PAGE_FP_BIT);

	/* Set page access key and fetch protection bit from pgste */

	/* Set page access key and fetch protection bit from pgste */
@@ -712,7 +718,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, 




	if (mm_has_pgste(mm)) {

	if (mm_has_pgste(mm)) {

		pgste = pgste_get_lock(ptep);

		pgste = pgste_get_lock(ptep);

		pgste_set_pte(ptep, pgste);

		pgste_set_pte(ptep, pgste, entry);

		*ptep = entry;

		*ptep = entry;

		pgste_set_unlock(ptep, pgste);

		pgste_set_unlock(ptep, pgste);

	} else

	} else

arch/s390/include/asm/setup.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,7 @@ extern unsigned int user_mode; 
#define MACHINE_FLAG_LPAR	(1UL << 12)

#define MACHINE_FLAG_LPAR	(1UL << 12)

#define MACHINE_FLAG_SPP	(1UL << 13)

#define MACHINE_FLAG_SPP	(1UL << 13)

#define MACHINE_FLAG_TOPOLOGY	(1UL << 14)

#define MACHINE_FLAG_TOPOLOGY	(1UL << 14)

#define MACHINE_FLAG_STCKF	(1UL << 15)





#define MACHINE_IS_VM		(S390_lowcore.machine_flags & MACHINE_FLAG_VM)

#define MACHINE_IS_VM		(S390_lowcore.machine_flags & MACHINE_FLAG_VM)

#define MACHINE_IS_KVM		(S390_lowcore.machine_flags & MACHINE_FLAG_KVM)

#define MACHINE_IS_KVM		(S390_lowcore.machine_flags & MACHINE_FLAG_KVM)
@@ -100,6 +101,7 @@ extern unsigned int user_mode; 
#define MACHINE_HAS_PFMF	(0)

#define MACHINE_HAS_PFMF	(0)

#define MACHINE_HAS_SPP		(0)

#define MACHINE_HAS_SPP		(0)

#define MACHINE_HAS_TOPOLOGY	(0)

#define MACHINE_HAS_TOPOLOGY	(0)

#define MACHINE_HAS_STCKF	(0)

#else /* __s390x__ */

#else /* __s390x__ */

#define MACHINE_HAS_IEEE	(1)

#define MACHINE_HAS_IEEE	(1)

#define MACHINE_HAS_CSP		(1)

#define MACHINE_HAS_CSP		(1)
@@ -111,6 +113,7 @@ extern unsigned int user_mode; 
#define MACHINE_HAS_PFMF	(S390_lowcore.machine_flags & MACHINE_FLAG_PFMF)

#define MACHINE_HAS_PFMF	(S390_lowcore.machine_flags & MACHINE_FLAG_PFMF)

#define MACHINE_HAS_SPP		(S390_lowcore.machine_flags & MACHINE_FLAG_SPP)

#define MACHINE_HAS_SPP		(S390_lowcore.machine_flags & MACHINE_FLAG_SPP)

#define MACHINE_HAS_TOPOLOGY	(S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY)

#define MACHINE_HAS_TOPOLOGY	(S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY)

#define MACHINE_HAS_STCKF	(S390_lowcore.machine_flags & MACHINE_FLAG_STCKF)

#endif /* __s390x__ */

#endif /* __s390x__ */





#define ZFCPDUMP_HSA_SIZE	(32UL<<20)

#define ZFCPDUMP_HSA_SIZE	(32UL<<20)

arch/s390/include/asm/timex.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -90,7 +90,7 @@ static inline unsigned long long get_clock_fast(void) 
{

{

	unsigned long long clk;

	unsigned long long clk;





	if (test_facility(25))

	if (MACHINE_HAS_STCKF)

		asm volatile(".insn	s,0xb27c0000,%0" : "=Q" (clk) : : "cc");

		asm volatile(".insn	s,0xb27c0000,%0" : "=Q" (clk) : : "cc");

	else

	else

		clk = get_clock();

		clk = get_clock();