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

Commit e1dbc5a4 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:

 - A couple of patches for the zcrypt driver:
     + Add two masks to determine which AP cards and queues are host
       devices, this will be useful for KVM AP device passthrough
     + Add-on patch to improve the parsing of the new apmask and aqmask
     + Some code beautification

 - Second try to reenable the GCC plugins, the first patch set had a
   patch to do this but the merge somehow missed this

 - Remove the s390 specific GCC version check and use the generic one

 - Three patches for kdump, two bug fixes and one cleanup

 - Three patches for the PCI layer, one bug fix and two cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: remove gcc version check (4.3 or newer)
  s390/zcrypt: hex string mask improvements for apmask and aqmask.
  s390/zcrypt: AP bus support for alternate driver(s)
  s390/zcrypt: code beautify
  s390/zcrypt: switch return type to bool for ap_instructions_available()
  s390/kdump: Remove kzalloc_panic
  s390/kdump: Fix memleak in nt_vmcoreinfo
  s390/kdump: Make elfcorehdr size calculation ABI compliant
  s390/pci: remove fmb address from debug output
  s390/pci: remove stale rc
  s390/pci: fix out of bounds access during irq setup
  s390/zcrypt: fix ap_instructions_available() returncodes
  s390: reenable gcc plugins for real
parents 40c431a5 4ec84835

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ config S390 
	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GCC_PLUGINS if BROKEN

	select HAVE_GCC_PLUGINS

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZ4

arch/s390/include/asm/ap.h

+7 −7
Original line number Diff line number Diff line
@@ -49,23 +49,23 @@ struct ap_queue_status { 
/**

 * ap_intructions_available() - Test if AP instructions are available.

 *

 * Returns 0 if the AP instructions are installed.

 * Returns true if the AP instructions are installed, otherwise false.

 */

static inline int ap_instructions_available(void)

static inline bool ap_instructions_available(void)

{

	register unsigned long reg0 asm ("0") = AP_MKQID(0, 0);

	register unsigned long reg1 asm ("1") = -ENODEV;

	register unsigned long reg2 asm ("2");

	register unsigned long reg1 asm ("1") = 0;

	register unsigned long reg2 asm ("2") = 0;



	asm volatile(

		"   .long 0xb2af0000\n"		/* PQAP(TAPQ) */

		"0: la    %0,0\n"

		"0: la    %0,1\n"

		"1:\n"

		EX_TABLE(0b, 1b)

		: "+d" (reg1), "=d" (reg2)

		: "+d" (reg1), "+d" (reg2)

		: "d" (reg0)

		: "cc");

	return reg1;

	return reg1 != 0;

}



/**

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

+36 −36
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ struct zcrypt_device_matrix_ext { 
	struct zcrypt_device_status_ext device[MAX_ZDEV_ENTRIES_EXT];

};



#define AUTOSELECT ((unsigned int)0xFFFFFFFF)

#define AUTOSELECT 0xFFFFFFFF



#define ZCRYPT_IOCTL_MAGIC 'z'

arch/s390/kernel/asm-offsets.c

+0 −8
Original line number Diff line number Diff line
@@ -17,14 +17,6 @@ 
#include <asm/gmap.h>

#include <asm/nmi.h>



/*

 * Make sure that the compiler is new enough. We want a compiler that

 * is known to work with the "Q" assembler constraint.

 */

#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)

#error Your compiler is too old; please use version 4.3 or newer

#endif



int main(void)

{

	/* task struct offsets */

arch/s390/kernel/crash_dump.c

+34 −36
Original line number Diff line number Diff line
@@ -293,19 +293,6 @@ int remap_oldmem_pfn_range(struct vm_area_struct *vma, unsigned long from, 
						       prot);

}



/*

 * Alloc memory and panic in case of ENOMEM

 */

static void *kzalloc_panic(int len)

{

	void *rc;



	rc = kzalloc(len, GFP_KERNEL);

	if (!rc)

		panic("s390 kdump kzalloc (%d) failed", len);

	return rc;

}



static const char *nt_name(Elf64_Word type)

{

	const char *name = "LINUX";
@@ -451,11 +438,15 @@ static void *get_vmcoreinfo_old(unsigned long *size) 
	if (copy_oldmem_kernel(nt_name, addr + sizeof(note),

			       sizeof(nt_name) - 1))

		return NULL;

	if (strcmp(nt_name, "VMCOREINFO") != 0)

	if (strcmp(nt_name, VMCOREINFO_NOTE_NAME) != 0)

		return NULL;

	vmcoreinfo = kzalloc(note.n_descsz, GFP_KERNEL);

	if (!vmcoreinfo)

		return NULL;

	vmcoreinfo = kzalloc_panic(note.n_descsz);

	if (copy_oldmem_kernel(vmcoreinfo, addr + 24, note.n_descsz))

	if (copy_oldmem_kernel(vmcoreinfo, addr + 24, note.n_descsz)) {

		kfree(vmcoreinfo);

		return NULL;

	}

	*size = note.n_descsz;

	return vmcoreinfo;

}
@@ -465,39 +456,38 @@ static void *get_vmcoreinfo_old(unsigned long *size) 
 */

static void *nt_vmcoreinfo(void *ptr)

{

	const char *name = VMCOREINFO_NOTE_NAME;

	unsigned long size;

	void *vmcoreinfo;



	vmcoreinfo = os_info_old_entry(OS_INFO_VMCOREINFO, &size);

	if (!vmcoreinfo)

	if (vmcoreinfo)

		return nt_init_name(ptr, 0, vmcoreinfo, size, name);



	vmcoreinfo = get_vmcoreinfo_old(&size);

	if (!vmcoreinfo)

		return ptr;

	return nt_init_name(ptr, 0, vmcoreinfo, size, "VMCOREINFO");

	ptr = nt_init_name(ptr, 0, vmcoreinfo, size, name);

	kfree(vmcoreinfo);

	return ptr;

}



static size_t nt_vmcoreinfo_size(void)

{

	const char *name = "VMCOREINFO";

	char nt_name[11];

	Elf64_Nhdr note;

	void *addr;



	if (copy_oldmem_kernel(&addr, &S390_lowcore.vmcore_info, sizeof(addr)))

		return 0;



	if (copy_oldmem_kernel(&note, addr, sizeof(note)))

		return 0;

	const char *name = VMCOREINFO_NOTE_NAME;

	unsigned long size;

	void *vmcoreinfo;



	memset(nt_name, 0, sizeof(nt_name));

	if (copy_oldmem_kernel(nt_name, addr + sizeof(note),

			       sizeof(nt_name) - 1))

		return 0;

	vmcoreinfo = os_info_old_entry(OS_INFO_VMCOREINFO, &size);

	if (vmcoreinfo)

		return nt_size_name(size, name);



	if (strcmp(nt_name, name) != 0)

	vmcoreinfo = get_vmcoreinfo_old(&size);

	if (!vmcoreinfo)

		return 0;



	return nt_size_name(note.n_descsz, name);

	kfree(vmcoreinfo);

	return nt_size_name(size, name);

}



/*
@@ -660,7 +650,15 @@ int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size) 


	alloc_size = get_elfcorehdr_size(mem_chunk_cnt);



	hdr = kzalloc_panic(alloc_size);

	hdr = kzalloc(alloc_size, GFP_KERNEL);



	/* Without elfcorehdr /proc/vmcore cannot be created. Thus creating

	 * a dump with this crash kernel will fail. Panic now to allow other

	 * dump mechanisms to take over.

	 */

	if (!hdr)

		panic("s390 kdump allocating elfcorehdr failed");



	/* Init elf header */

	ptr = ehdr_init(hdr, mem_chunk_cnt);

	/* Init program headers */