Преглед изворни кода

[S390] cio: Dont call css_update_ssd_info from interrupt context.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cornelia Huck пре 18 година
родитељ
комит
82b7ac058f
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 1
      drivers/s390/cio/device.c
  2. 0 1
      drivers/s390/cio/device_fsm.c

+ 2 - 1
drivers/s390/cio/device.c

@@ -743,6 +743,7 @@ static int io_subchannel_recog(struct ccw_device *, struct subchannel *);
 static void sch_attach_device(struct subchannel *sch,
 static void sch_attach_device(struct subchannel *sch,
 			      struct ccw_device *cdev)
 			      struct ccw_device *cdev)
 {
 {
+	css_update_ssd_info(sch);
 	spin_lock_irq(sch->lock);
 	spin_lock_irq(sch->lock);
 	sch->dev.driver_data = cdev;
 	sch->dev.driver_data = cdev;
 	cdev->private->schid = sch->schid;
 	cdev->private->schid = sch->schid;
@@ -878,7 +879,7 @@ io_subchannel_register(struct work_struct *work)
 	priv = container_of(work, struct ccw_device_private, kick_work);
 	priv = container_of(work, struct ccw_device_private, kick_work);
 	cdev = priv->cdev;
 	cdev = priv->cdev;
 	sch = to_subchannel(cdev->dev.parent);
 	sch = to_subchannel(cdev->dev.parent);
-
+	css_update_ssd_info(sch);
 	/*
 	/*
 	 * io_subchannel_register() will also be called after device
 	 * io_subchannel_register() will also be called after device
 	 * recognition has been done for a boxed device (which will already
 	 * recognition has been done for a boxed device (which will already

+ 0 - 1
drivers/s390/cio/device_fsm.c

@@ -246,7 +246,6 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
 	 */
 	 */
 	old_lpm = sch->lpm;
 	old_lpm = sch->lpm;
 	stsch(sch->schid, &sch->schib);
 	stsch(sch->schid, &sch->schib);
-	css_update_ssd_info(sch);
 	sch->lpm = sch->schib.pmcw.pam & sch->opm;
 	sch->lpm = sch->schib.pmcw.pam & sch->opm;
 	/* Check since device may again have become not operational. */
 	/* Check since device may again have become not operational. */
 	if (!sch->schib.pmcw.dnv)
 	if (!sch->schib.pmcw.dnv)