Skip to contentSkip to conversation

s390: Prepatory cleanup in common I/O layer.

PATCH In review Cornelia Huck 1 participant 1 message Nov 14, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 3/5 s390: Prepatory cleanup in common I/O layer.

From: Cornelia Huck <[email protected]>

Some preparations for the dynamic subchannel mapping patch.

- Move adding subchannel attributes to css_register_subchannel().
- Don't call device_trigger_reprobe() for non-operational devices.
- Introduce io_subchannel_create_ccwdev().

---
 drivers/s390/cio/css.c        |   13 +++--
 drivers/s390/cio/css.h        |    2 
 drivers/s390/cio/device.c     |  102 +++++++++++++++++++++++++-----------------
 drivers/s390/cio/device_fsm.c |    3 -
 4 files changed, 75 insertions(+), 45 deletions(-)
drivers/s390/cio/css.c +9 -4
@@ -135,14 +135,19 @@ css_register_subchannel(struct subchanne
 	sch->dev.parent = &css[0]->device;
 	sch->dev.bus = &css_bus_type;
 	sch->dev.release = &css_subchannel_release;
-	
+
 	/* make it known to the system */
 	ret = css_sch_device_register(sch);
-	if (ret)
+	if (ret) {
 		printk (KERN_WARNING "%s: could not register %s\n",
 			__func__, sch->dev.bus_id);
-	else
-		css_get_ssd_info(sch);
+		return ret;
+	}
+	css_get_ssd_info(sch);
+	ret = subchannel_add_files(&sch->dev);
+	if (ret)
+		printk(KERN_WARNING "%s: could not add attributes to %s\n",
+		       __func__, sch->dev.bus_id);
 	return ret;
 }
 
drivers/s390/cio/css.h +2 -0
@@ -184,4 +184,6 @@ extern int need_rescan;
 
 extern struct workqueue_struct *slow_path_wq;
 extern struct work_struct slow_path_work;
+
+int subchannel_add_files (struct device *);
 #endif
drivers/s390/cio/device.c +62 -40

144 lines not on this page · raw message

drivers/s390/cio/device_fsm.c +2 -1
@@ -1077,7 +1077,8 @@ device_trigger_reprobe(struct subchannel
 	/* Update some values. */
 	if (stsch(sch->schid, &sch->schib))
 		return;
-
+	if (!sch->schib.pmcw.dnv)
+		return;
 	/*
 	 * The pim, pam, pom values may not be accurate, but they are the best
 	 * we have before performing device selection :/