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

Commit 04a17ede authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Martin Schwidefsky:

 - A larger update for the zcrypt / AP bus code:
    + Update two inline assemblies in the zcrypt driver to make gcc happy
    + Add a missing reply code for invalid special commands for zcrypt
    + Allow AP device reset to be triggered from user space
    + Split the AP scan function into smaller, more readable functions

 - Updates for vfio-ccw and vfio-ap
    + Add maintainers and reviewer for vfio-ccw
    + Include facility.h in vfio_ap_drv.c to avoid fragile include chain
    + Simplicy vfio-ccw state machine

 - Use the common code version of bust_spinlocks

 - Make use of the DEFINE_SHOW_ATTRIBUTE

 - Fix three incorrect file permissions in the DASD driver

 - Remove bit spin-lock from the PCI interrupt handler

 - Fix GFP_ATOMIC vs GFP_KERNEL in the PCI code

* tag 's390-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/zcrypt: rework ap scan bus code
  s390/zcrypt: make sysfs reset attribute trigger queue reset
  s390/pci: fix sleeping in atomic during hotplug
  s390/pci: remove bit_lock usage in interrupt handler
  s390/drivers: fix proc/debugfs file permissions
  s390: convert to DEFINE_SHOW_ATTRIBUTE
  MAINTAINERS/vfio-ccw: add Farhan and Eric, make Halil Reviewer
  vfio: ccw: Merge BUSY and BOXED states
  s390: use common bust_spinlocks()
  s390/zcrypt: improve special ap message cmd handling
  s390/ap: rework assembler functions to use unions for in/out register variables
  s390: vfio-ap: include <asm/facility> for test_facility()
parents e6b92572 ec10574d

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -13162,7 +13162,9 @@ F: drivers/pci/hotplug/s390_pci_hpc.c 


S390 VFIO-CCW DRIVER

M:	Cornelia Huck <cohuck@redhat.com>

M:	Halil Pasic <pasic@linux.ibm.com>

M:	Farhan Ali <alifm@linux.ibm.com>

M:	Eric Farman <farman@linux.ibm.com>

R:	Halil Pasic <pasic@linux.ibm.com>

L:	linux-s390@vger.kernel.org

L:	kvm@vger.kernel.org

S:	Supported

arch/s390/include/asm/ap.h

+19 −9
Original line number Diff line number Diff line
@@ -221,16 +221,22 @@ static inline struct ap_queue_status ap_aqic(ap_qid_t qid, 
					     void *ind)

{

	register unsigned long reg0 asm ("0") = qid | (3UL << 24);

	register struct ap_qirq_ctrl reg1_in asm ("1") = qirqctrl;

	register struct ap_queue_status reg1_out asm ("1");

	register union {

		unsigned long value;

		struct ap_qirq_ctrl qirqctrl;

		struct ap_queue_status status;

	} reg1 asm ("1");

	register void *reg2 asm ("2") = ind;



	reg1.qirqctrl = qirqctrl;



	asm volatile(

		".long 0xb2af0000"		/* PQAP(AQIC) */

		: "=d" (reg1_out)

		: "d" (reg0), "d" (reg1_in), "d" (reg2)

		: "+d" (reg1)

		: "d" (reg0), "d" (reg2)

		: "cc");

	return reg1_out;



	return reg1.status;

}



/*
@@ -264,17 +270,21 @@ static inline struct ap_queue_status ap_qact(ap_qid_t qid, int ifbit, 
{

	register unsigned long reg0 asm ("0") = qid | (5UL << 24)

		| ((ifbit & 0x01) << 22);

	register unsigned long reg1_in asm ("1") = apinfo->val;

	register struct ap_queue_status reg1_out asm ("1");

	register union {

		unsigned long value;

		struct ap_queue_status status;

	} reg1 asm ("1");

	register unsigned long reg2 asm ("2");



	reg1.value = apinfo->val;



	asm volatile(

		".long 0xb2af0000"		/* PQAP(QACT) */

		: "+d" (reg1_in), "=d" (reg1_out), "=d" (reg2)

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

		: "d" (reg0)

		: "cc");

	apinfo->val = reg2;

	return reg1_out;

	return reg1.status;

}



/**

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

+2 −2
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ struct ica_xcRB { 
 * @cprb_len:		CPRB header length [0x0020]

 * @cprb_ver_id:	CPRB version id.   [0x04]

 * @pad_000:		Alignment pad bytes

 * @flags:		Admin cmd [0x80] or functional cmd [0x00]

 * @func_id:		Function id / subtype [0x5434]

 * @flags:		Admin bit [0x80], Special bit [0x20]

 * @func_id:		Function id / subtype [0x5434] "T4"

 * @source_id:		Source id [originator id]

 * @target_id:		Target id [usage/ctrl domain id]

 * @ret_code:		Return code

arch/s390/mm/fault.c

+0 −24
Original line number Diff line number Diff line
@@ -81,30 +81,6 @@ static inline int notify_page_fault(struct pt_regs *regs) 
	return ret;

}





/*

 * Unlock any spinlocks which will prevent us from getting the

 * message out.

 */

void bust_spinlocks(int yes)

{

	if (yes) {

		oops_in_progress = 1;

	} else {

		int loglevel_save = console_loglevel;

		console_unblank();

		oops_in_progress = 0;

		/*

		 * OK, the message is on the console.  Now we call printk()

		 * without oops_in_progress set so that printk will give klogd

		 * a poke.  Hold onto your hats...

		 */

		console_loglevel = 15;

		printk(" ");

		console_loglevel = loglevel_save;

	}

}



/*

 * Find out which address space caused the exception.

 * Access register mode is impossible, ignore space == 3.

arch/s390/pci/pci.c

+1 −3
Original line number Diff line number Diff line
@@ -382,9 +382,7 @@ static void zpci_irq_handler(struct airq_struct *airq) 
			if (ai == -1UL)

				break;

			inc_irq_stat(IRQIO_MSI);

			airq_iv_lock(aibv, ai);

			generic_handle_irq(airq_iv_get_data(aibv, ai));

			airq_iv_unlock(aibv, ai);

		}

	}

}
@@ -410,7 +408,7 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) 
	zdev->aisb = aisb;



	/* Create adapter interrupt vector */

	zdev->aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK);

	zdev->aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA);

	if (!zdev->aibv)

		return -ENOMEM;