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

Commit 9368dac4 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

s390: Add a mechanism to get the subchannel id. 



This will be needed by the new virtio-ccw transport.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 36eb2caa

arch/s390/include/asm/ccwdev.h

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ struct irb; 
struct ccw1;

struct ccw_dev_id;



/* from asm/schid.h */

struct subchannel_id;



/* simplified initializers for struct ccw_device:

 * CCW_DEVICE and CCW_DEVICE_DEVTYPE initialize one

 * entry in your MODULE_DEVICE_TABLE and set the match_flag correctly */
@@ -226,5 +229,7 @@ int ccw_device_siosl(struct ccw_device *); 
// FIXME: these have to go

extern int _ccw_device_get_subchannel_number(struct ccw_device *);



extern void ccw_device_get_schid(struct ccw_device *, struct subchannel_id *);



extern void *ccw_device_get_chp_desc(struct ccw_device *, int);

#endif /* _S390_CCWDEV_H_ */

drivers/s390/cio/device_ops.c

+12 −0
Original line number Diff line number Diff line
@@ -763,6 +763,18 @@ _ccw_device_get_subchannel_number(struct ccw_device *cdev) 
	return cdev->private->schid.sch_no;

}



/**

 * ccw_device_get_schid - obtain a subchannel id

 * @cdev: device to obtain the id for

 * @schid: where to fill in the values

 */

void ccw_device_get_schid(struct ccw_device *cdev, struct subchannel_id *schid)

{

	struct subchannel *sch = to_subchannel(cdev->dev.parent);



	*schid = sch->schid;

}

EXPORT_SYMBOL_GPL(ccw_device_get_schid);



MODULE_LICENSE("GPL");

EXPORT_SYMBOL(ccw_device_set_options_mask);