Commit 523a05fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more s390 updates from Vasily Gorbik:
 "Second round of s390 fixes and features for 5.7:

   - The rest of fallthrough; annotations conversion

   - Couple of fixes for ADD uevents in the common I/O layer

   - Minor refactoring of the queued direct I/O code"

* tag 's390-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/cio: generate delayed uevent for vfio-ccw subchannels
  s390/cio: avoid duplicated 'ADD' uevents
  s390/qdio: clear DSCI early for polling drivers
  s390/qdio: inline shared_ind()
  s390/qdio: remove cdev from init_data
  s390/qdio: allow for non-contiguous SBAL array in init_data
  zfcp: inline zfcp_qdio_setup_init_data()
  s390/qdio: cleanly split alloc and establish
  s390/mm: use fallthrough;
parents c0cc2711 2bc55eae

arch/s390/include/asm/qdio.h

+8 −8
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int, 


/**

 * struct qdio_initialize - qdio initialization data

 * @cdev: associated ccw device

 * @q_format: queue format

 * @qdr_ac: feature flags to set

 * @adapter_name: name for the adapter
@@ -341,12 +340,11 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int, 
 * @irq_poll: Data IRQ polling handler (NULL when not supported)

 * @scan_threshold: # of in-use buffers that triggers scan on output queue

 * @int_parm: interruption parameter

 * @input_sbal_addr_array:  address of no_input_qs * 128 pointers

 * @output_sbal_addr_array: address of no_output_qs * 128 pointers

 * @input_sbal_addr_array:  per-queue array, each element points to 128 SBALs

 * @output_sbal_addr_array: per-queue array, each element points to 128 SBALs

 * @output_sbal_state_array: no_output_qs * 128 state info (for CQ or NULL)

 */

struct qdio_initialize {

	struct ccw_device *cdev;

	unsigned char q_format;

	unsigned char qdr_ac;

	unsigned char adapter_name[8];
@@ -362,8 +360,8 @@ struct qdio_initialize { 
	void (*irq_poll)(struct ccw_device *cdev, unsigned long data);

	unsigned int scan_threshold;

	unsigned long int_parm;

	struct qdio_buffer **input_sbal_addr_array;

	struct qdio_buffer **output_sbal_addr_array;

	struct qdio_buffer ***input_sbal_addr_array;

	struct qdio_buffer ***output_sbal_addr_array;

	struct qdio_outbuf_state *output_sbal_state_array;

};
@@ -408,8 +406,10 @@ int qdio_alloc_buffers(struct qdio_buffer **buf, unsigned int count); 
void qdio_free_buffers(struct qdio_buffer **buf, unsigned int count);

void qdio_reset_buffers(struct qdio_buffer **buf, unsigned int count);



extern int qdio_allocate(struct qdio_initialize *);

extern int qdio_establish(struct qdio_initialize *);

extern int qdio_allocate(struct ccw_device *cdev, unsigned int no_input_qs,

			 unsigned int no_output_qs);

extern int qdio_establish(struct ccw_device *cdev,

			  struct qdio_initialize *init_data);

extern int qdio_activate(struct ccw_device *);

extern void qdio_release_aob(struct qaob *);

extern int do_QDIO(struct ccw_device *, unsigned int, int, unsigned int,

arch/s390/mm/fault.c

+0 −2
Original line number Diff line number Diff line
@@ -852,9 +852,7 @@ void do_secure_storage_access(struct pt_regs *regs) 
			BUG();

		break;

	case VDSO_FAULT:

		/* fallthrough */

	case GMAP_FAULT:

		/* fallthrough */

	default:

		do_fault_error(regs, VM_READ | VM_WRITE, VM_FAULT_BADMAP);

		WARN_ON_ONCE(1);

drivers/s390/cio/device.c

+9 −4
Original line number Diff line number Diff line
@@ -849,8 +849,10 @@ static void io_subchannel_register(struct ccw_device *cdev) 
	 * Now we know this subchannel will stay, we can throw

	 * our delayed uevent.

	 */

	if (dev_get_uevent_suppress(&sch->dev)) {

		dev_set_uevent_suppress(&sch->dev, 0);

		kobject_uevent(&sch->dev.kobj, KOBJ_ADD);

	}

	/* make it known to the system */

	ret = ccw_device_add(cdev);

	if (ret) {
@@ -1058,8 +1060,11 @@ static int io_subchannel_probe(struct subchannel *sch) 
		 * Throw the delayed uevent for the subchannel, register

		 * the ccw_device and exit.

		 */

		if (dev_get_uevent_suppress(&sch->dev)) {

			/* should always be the case for the console */

			dev_set_uevent_suppress(&sch->dev, 0);

			kobject_uevent(&sch->dev.kobj, KOBJ_ADD);

		}

		cdev = sch_get_cdev(sch);

		rc = ccw_device_add(cdev);

		if (rc) {

drivers/s390/cio/qdio.h

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ int tiqdio_allocate_memory(void); 
void tiqdio_free_memory(void);

int tiqdio_register_thinints(void);

void tiqdio_unregister_thinints(void);

void clear_nonshared_ind(struct qdio_irq *);

int test_nonshared_ind(struct qdio_irq *);



/* prototypes for setup */

drivers/s390/cio/qdio_debug.c

+1 −15
Original line number Diff line number Diff line
@@ -58,25 +58,11 @@ static void qdio_clear_dbf_list(void) 
	mutex_unlock(&qdio_dbf_list_mutex);

}



int qdio_allocate_dbf(struct qdio_initialize *init_data,

		       struct qdio_irq *irq_ptr)

int qdio_allocate_dbf(struct qdio_irq *irq_ptr)

{

	char text[QDIO_DBF_NAME_LEN];

	struct qdio_dbf_entry *new_entry;



	DBF_EVENT("qfmt:%1d", init_data->q_format);

	DBF_HEX(init_data->adapter_name, 8);

	DBF_EVENT("qpff%4x", init_data->qib_param_field_format);

	DBF_HEX(&init_data->qib_param_field, sizeof(void *));

	DBF_HEX(&init_data->input_slib_elements, sizeof(void *));

	DBF_HEX(&init_data->output_slib_elements, sizeof(void *));

	DBF_EVENT("niq:%1d noq:%1d", init_data->no_input_qs,

		  init_data->no_output_qs);

	DBF_HEX(&init_data->input_handler, sizeof(void *));

	DBF_HEX(&init_data->output_handler, sizeof(void *));

	DBF_HEX(&init_data->int_parm, sizeof(long));

	DBF_HEX(&init_data->input_sbal_addr_array, sizeof(void *));

	DBF_HEX(&init_data->output_sbal_addr_array, sizeof(void *));

	DBF_EVENT("irq:%8lx", (unsigned long)irq_ptr);



	/* allocate trace view for the interface */

CRA Git | Maintained and supported by SUSTech CRA and CCSE