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

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

[S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private 



Use the proper structures to identify device and subchannel. Change
get_disc_ccwdev_by_devno() to get_disc_ccwdev_by_dev_id().

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

drivers/s390/cio/css.h

+2 −3
Original line number Diff line number Diff line
@@ -76,9 +76,8 @@ struct ccw_device_private { 
	int state;		/* device state */

	atomic_t onoff;

	unsigned long registered;

	__u16 devno;		/* device number */

	__u16 sch_no;		/* subchannel number */

	__u8 ssid;              /* subchannel set id */

	struct ccw_dev_id dev_id;	/* device id */

	struct subchannel_id schid;	/* subchannel number */

	__u8 imask;		/* lpm mask for SNID/SID/SPGID */

	int iretry;		/* retry counter SNID/SID/SPGID */

	struct {

drivers/s390/cio/device.c

+15 −17
Original line number Diff line number Diff line
@@ -552,21 +552,19 @@ ccw_device_register(struct ccw_device *cdev) 
}



struct match_data {

	unsigned int devno;

	unsigned int ssid;

	struct ccw_dev_id dev_id;

	struct ccw_device * sibling;

};



static int

match_devno(struct device * dev, void * data)

{

	struct match_data * d = (struct match_data *)data;

	struct match_data * d = data;

	struct ccw_device * cdev;



	cdev = to_ccwdev(dev);

	if ((cdev->private->state == DEV_STATE_DISCONNECTED) &&

	    (cdev->private->devno == d->devno) &&

	    (cdev->private->ssid == d->ssid) &&

	    ccw_dev_id_is_equal(&cdev->private->dev_id, &d->dev_id) &&

	    (cdev != d->sibling)) {

		cdev->private->state = DEV_STATE_NOT_OPER;

		return 1;
@@ -574,15 +572,13 @@ match_devno(struct device * dev, void * data) 
	return 0;

}



static struct ccw_device *

get_disc_ccwdev_by_devno(unsigned int devno, unsigned int ssid,

static struct ccw_device * get_disc_ccwdev_by_dev_id(struct ccw_dev_id *dev_id,

						     struct ccw_device *sibling)

{

	struct device *dev;

	struct match_data data;



	data.devno = devno;

	data.ssid = ssid;

	data.dev_id = *dev_id;

	data.sibling = sibling;

	dev = bus_find_device(&ccw_bus_type, NULL, &data, match_devno);
@@ -618,7 +614,7 @@ ccw_device_do_unreg_rereg(void *data) 


	cdev = (struct ccw_device *)data;

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

	if (cdev->private->devno != sch->schib.pmcw.dev) {

	if (cdev->private->dev_id.devno != sch->schib.pmcw.dev) {

		/*

		 * The device number has changed. This is usually only when

		 * a device has been detached under VM and then re-appeared
@@ -633,10 +629,12 @@ ccw_device_do_unreg_rereg(void *data) 
		 *        get possibly sick...

		 */

		struct ccw_device *other_cdev;

		struct ccw_dev_id dev_id;



		need_rename = 1;

		other_cdev = get_disc_ccwdev_by_devno(sch->schib.pmcw.dev,

						      sch->schid.ssid, cdev);

		dev_id.devno = sch->schib.pmcw.dev;

		dev_id.ssid = sch->schid.ssid;

		other_cdev = get_disc_ccwdev_by_dev_id(&dev_id, cdev);

		if (other_cdev) {

			struct subchannel *other_sch;
@@ -652,7 +650,7 @@ ccw_device_do_unreg_rereg(void *data) 
		}

		/* Update ssd info here. */

		css_get_ssd_info(sch);

		cdev->private->devno = sch->schib.pmcw.dev;

		cdev->private->dev_id.devno = sch->schib.pmcw.dev;

	} else

		need_rename = 0;

	device_remove_files(&cdev->dev);
@@ -792,9 +790,9 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch) 


	/* Init private data. */

	priv = cdev->private;

	priv->devno = sch->schib.pmcw.dev;

	priv->ssid = sch->schid.ssid;

	priv->sch_no = sch->schid.sch_no;

	priv->dev_id.devno = sch->schib.pmcw.dev;

	priv->dev_id.ssid = sch->schid.ssid;

	priv->schid = sch->schid;

	priv->state = DEV_STATE_NOT_OPER;

	INIT_LIST_HEAD(&priv->cmb_list);

	init_waitqueue_head(&priv->wait_q);

drivers/s390/cio/device_fsm.c

+8 −6
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ ccw_device_handle_oper(struct ccw_device *cdev) 
	    cdev->id.cu_model != cdev->private->senseid.cu_model ||

	    cdev->id.dev_type != cdev->private->senseid.dev_type ||

	    cdev->id.dev_model != cdev->private->senseid.dev_model ||

	    cdev->private->devno != sch->schib.pmcw.dev) {

	    cdev->private->dev_id.devno != sch->schib.pmcw.dev) {

		PREPARE_WORK(&cdev->private->kick_work,

			     ccw_device_do_unreg_rereg, (void *)cdev);

		queue_work(ccw_device_work, &cdev->private->kick_work);
@@ -255,7 +255,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) 
	case DEV_STATE_NOT_OPER:

		CIO_DEBUG(KERN_WARNING, 2,

			  "SenseID : unknown device %04x on subchannel "

			  "0.%x.%04x\n", cdev->private->devno,

			  "0.%x.%04x\n", cdev->private->dev_id.devno,

			  sch->schid.ssid, sch->schid.sch_no);

		break;

	case DEV_STATE_OFFLINE:
@@ -282,14 +282,15 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) 
		CIO_DEBUG(KERN_INFO, 2, "SenseID : device 0.%x.%04x reports: "

			  "CU  Type/Mod = %04X/%02X, Dev Type/Mod = "

			  "%04X/%02X\n",

			  cdev->private->ssid, cdev->private->devno,

			  cdev->private->dev_id.ssid,

			  cdev->private->dev_id.devno,

			  cdev->id.cu_type, cdev->id.cu_model,

			  cdev->id.dev_type, cdev->id.dev_model);

		break;

	case DEV_STATE_BOXED:

		CIO_DEBUG(KERN_WARNING, 2,

			  "SenseID : boxed device %04x on subchannel "

			  "0.%x.%04x\n", cdev->private->devno,

			  "0.%x.%04x\n", cdev->private->dev_id.devno,

			  sch->schid.ssid, sch->schid.sch_no);

		break;

	}
@@ -363,7 +364,7 @@ ccw_device_done(struct ccw_device *cdev, int state) 
	if (state == DEV_STATE_BOXED)

		CIO_DEBUG(KERN_WARNING, 2,

			  "Boxed device %04x on subchannel %04x\n",

			  cdev->private->devno, sch->schid.sch_no);

			  cdev->private->dev_id.devno, sch->schid.sch_no);



	if (cdev->private->flags.donotify) {

		cdev->private->flags.donotify = 0;
@@ -412,7 +413,8 @@ static void __ccw_device_get_common_pgid(struct ccw_device *cdev) 
		/* PGID mismatch, can't pathgroup. */

		CIO_MSG_EVENT(0, "SNID - pgid mismatch for device "

			      "0.%x.%04x, can't pathgroup\n",

			      cdev->private->ssid, cdev->private->devno);

			      cdev->private->dev_id.ssid,

			      cdev->private->dev_id.devno);

		cdev->private->options.pgroup = 0;

		return;

	}

drivers/s390/cio/device_id.c

+8 −6
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev) 
		 */

		CIO_MSG_EVENT(2, "SenseID : device %04x on Subchannel "

			      "0.%x.%04x reports cmd reject\n",

			      cdev->private->devno, sch->schid.ssid,

			      cdev->private->dev_id.devno, sch->schid.ssid,

			      sch->schid.sch_no);

		return -EOPNOTSUPP;

	}
@@ -259,7 +259,8 @@ ccw_device_check_sense_id(struct ccw_device *cdev) 
		CIO_MSG_EVENT(2, "SenseID : UC on dev 0.%x.%04x, "

			      "lpum %02X, cnt %02d, sns :"

			      " %02X%02X%02X%02X %02X%02X%02X%02X ...\n",

			      cdev->private->ssid, cdev->private->devno,

			      cdev->private->dev_id.ssid,

			      cdev->private->dev_id.devno,

			      irb->esw.esw0.sublog.lpum,

			      irb->esw.esw0.erw.scnt,

			      irb->ecw[0], irb->ecw[1],
@@ -274,14 +275,15 @@ ccw_device_check_sense_id(struct ccw_device *cdev) 
			CIO_MSG_EVENT(2, "SenseID : path %02X for device %04x "

				      "on subchannel 0.%x.%04x is "

				      "'not operational'\n", sch->orb.lpm,

				      cdev->private->devno, sch->schid.ssid,

				      sch->schid.sch_no);

				      cdev->private->dev_id.devno,

				      sch->schid.ssid, sch->schid.sch_no);

		return -EACCES;

	}

	/* Hmm, whatever happened, try again. */

	CIO_MSG_EVENT(2, "SenseID : start_IO() for device %04x on "

		      "subchannel 0.%x.%04x returns status %02X%02X\n",

		      cdev->private->devno, sch->schid.ssid, sch->schid.sch_no,

		      cdev->private->dev_id.devno, sch->schid.ssid,

		      sch->schid.sch_no,

		      irb->scsw.dstat, irb->scsw.cstat);

	return -EAGAIN;

}
@@ -330,7 +332,7 @@ ccw_device_sense_id_irq(struct ccw_device *cdev, enum dev_event dev_event) 
		/* fall through. */

	default:		/* Sense ID failed. Try asking VM. */

		if (MACHINE_IS_VM) {

			VM_virtual_device_info (cdev->private->devno,

			VM_virtual_device_info (cdev->private->dev_id.devno,

						&cdev->private->senseid);

			if (cdev->private->senseid.cu_type != 0xFFFF) {

				/* Got the device information from VM. */

drivers/s390/cio/device_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -592,13 +592,13 @@ ccw_device_get_chp_desc(struct ccw_device *cdev, int chp_no) 
int

_ccw_device_get_subchannel_number(struct ccw_device *cdev)

{

	return cdev->private->sch_no;

	return cdev->private->schid.sch_no;

}



int

_ccw_device_get_device_number(struct ccw_device *cdev)

{

	return cdev->private->devno;

	return cdev->private->dev_id.devno;

}