Skip to content

L
linux
Commit 139b83dd authored by Michael Ernst's avatar Michael Ernst Committed by Martin Schwidefsky
Browse files
Options

[S390] cio: Remove cio_msg kernel parameter. 

The only sporadically used CIO_DEBUG messages are replaced by ordinary
CIO_MSG_EVENT messages. The CIO_MSG_EVENT messages debug levels are
consolidated.
Signed-off-by: default avatarMichael Ernst <mernst@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0eaeafa1
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 94 deletions
Documentation/s390/CommonIO
View file @ 139b83dd
...@@ -8,17 +8,6 @@ Command line parameters ...@@ -8,17 +8,6 @@ Command line parameters
Enable logging of debug information in case of ccw device timeouts. Enable logging of debug information in case of ccw device timeouts.
* cio_msg = yes | no
Determines whether information on found devices and sensed device
characteristics should be shown during startup or when new devices are
found, i. e. messages of the types "Detected device 0.0.4711 on subchannel
0.0.0042" and "SenseID: Device 0.0.4711 reports: ...".
Default is off.
* cio_ignore = {all} | * cio_ignore = {all} |
{<device> | <range of devices>} | {<device> | <range of devices>} |
{!<device> | !<range of devices>} {!<device> | !<range of devices>}
......
drivers/s390/cio/blacklist.c
View file @ 139b83dd
...@@ -199,7 +199,6 @@ blacklist_parse_parameters (char *str, range_action action) ...@@ -199,7 +199,6 @@ blacklist_parse_parameters (char *str, range_action action)
static int __init static int __init
blacklist_setup (char *str) blacklist_setup (char *str)
{ {
CIO_MSG_EVENT(6, "Reading blacklist parameters\n");
return blacklist_parse_parameters (str, add); return blacklist_parse_parameters (str, add);
} }
......
drivers/s390/cio/cio.c
View file @ 139b83dd
...@@ -39,23 +39,6 @@ debug_info_t *cio_debug_msg_id; ...@@ -39,23 +39,6 @@ debug_info_t *cio_debug_msg_id;
debug_info_t *cio_debug_trace_id; debug_info_t *cio_debug_trace_id;
debug_info_t *cio_debug_crw_id; debug_info_t *cio_debug_crw_id;
int cio_show_msg;
static int __init
cio_setup (char *parm)
{
if (!strcmp (parm, "yes"))
cio_show_msg = 1;
else if (!strcmp (parm, "no"))
cio_show_msg = 0;
else
printk(KERN_ERR "cio: cio_setup: "
"invalid cio_msg parameter '%s'", parm);
return 1;
}
__setup ("cio_msg=", cio_setup);
/* /*
* Function: cio_debug_init * Function: cio_debug_init
* Initializes three debug logs for common I/O: * Initializes three debug logs for common I/O:
...@@ -166,7 +149,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm) ...@@ -166,7 +149,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm)
stsch (sch->schid, &sch->schib); stsch (sch->schid, &sch->schib);
CIO_MSG_EVENT(0, "cio_start: 'not oper' status for " CIO_MSG_EVENT(2, "cio_start: 'not oper' status for "
"subchannel 0.%x.%04x!\n", sch->schid.ssid, "subchannel 0.%x.%04x!\n", sch->schid.ssid,
sch->schid.sch_no); sch->schid.sch_no);
sprintf(dbf_text, "no%s", sch->dev.bus_id); sprintf(dbf_text, "no%s", sch->dev.bus_id);
...@@ -567,8 +550,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid) ...@@ -567,8 +550,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
* ... just being curious we check for non I/O subchannels * ... just being curious we check for non I/O subchannels
*/ */
if (sch->st != 0) { if (sch->st != 0) {
CIO_DEBUG(KERN_INFO, 0, CIO_MSG_EVENT(4, "Subchannel 0.%x.%04x reports "
"Subchannel 0.%x.%04x reports "
"non-I/O subchannel type %04X\n", "non-I/O subchannel type %04X\n",
sch->schid.ssid, sch->schid.sch_no, sch->st); sch->schid.ssid, sch->schid.sch_no, sch->st);
/* We stop here for non-io subchannels. */ /* We stop here for non-io subchannels. */
...@@ -588,7 +570,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid) ...@@ -588,7 +570,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
* This device must not be known to Linux. So we simply * This device must not be known to Linux. So we simply
* say that there is no device and return ENODEV. * say that there is no device and return ENODEV.
*/ */
CIO_MSG_EVENT(4, "Blacklisted device detected " CIO_MSG_EVENT(6, "Blacklisted device detected "
"at devno %04X, subchannel set %x\n", "at devno %04X, subchannel set %x\n",
sch->schib.pmcw.dev, sch->schid.ssid); sch->schib.pmcw.dev, sch->schid.ssid);
err = -ENODEV; err = -ENODEV;
...@@ -601,9 +583,8 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid) ...@@ -601,9 +583,8 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
sch->lpm = sch->schib.pmcw.pam & sch->opm; sch->lpm = sch->schib.pmcw.pam & sch->opm;
sch->isc = 3; sch->isc = 3;
CIO_DEBUG(KERN_INFO, 0, CIO_MSG_EVENT(6, "Detected device %04x on subchannel 0.%x.%04X "
"Detected device %04x on subchannel 0.%x.%04X" "- PIM = %02X, PAM = %02X, POM = %02X\n",
" - PIM = %02X, PAM = %02X, POM = %02X\n",
sch->schib.pmcw.dev, sch->schid.ssid, sch->schib.pmcw.dev, sch->schid.ssid,
sch->schid.sch_no, sch->schib.pmcw.pim, sch->schid.sch_no, sch->schib.pmcw.pim,
sch->schib.pmcw.pam, sch->schib.pmcw.pom); sch->schib.pmcw.pam, sch->schib.pmcw.pom);
......
drivers/s390/cio/cio.h
View file @ 139b83dd
...@@ -118,6 +118,4 @@ extern void *cio_get_console_priv(void); ...@@ -118,6 +118,4 @@ extern void *cio_get_console_priv(void);
#define cio_get_console_priv() NULL #define cio_get_console_priv() NULL
#endif #endif
extern int cio_show_msg;
#endif #endif
drivers/s390/cio/cio_debug.h
View file @ 139b83dd
...@@ -31,10 +31,4 @@ static inline void CIO_HEX_EVENT(int level, void *data, int length) ...@@ -31,10 +31,4 @@ static inline void CIO_HEX_EVENT(int level, void *data, int length)
} }
} }
#define CIO_DEBUG(printk_level, event_level, msg...) do { \
if (cio_show_msg) \
printk(printk_level "cio: " msg); \
CIO_MSG_EVENT(event_level, msg); \
} while (0)
#endif #endif
drivers/s390/cio/css.c
View file @ 139b83dd
...@@ -570,7 +570,7 @@ static void reprobe_all(struct work_struct *unused) ...@@ -570,7 +570,7 @@ static void reprobe_all(struct work_struct *unused)
{ {
int ret; int ret;
CIO_MSG_EVENT(2, "reprobe start\n"); CIO_MSG_EVENT(4, "reprobe start\n");
need_reprobe = 0; need_reprobe = 0;
/* Make sure initial subchannel scan is done. */ /* Make sure initial subchannel scan is done. */
...@@ -578,7 +578,7 @@ static void reprobe_all(struct work_struct *unused) ...@@ -578,7 +578,7 @@ static void reprobe_all(struct work_struct *unused)
atomic_read(&ccw_device_init_count) == 0); atomic_read(&ccw_device_init_count) == 0);
ret = for_each_subchannel_staged(NULL, reprobe_subchannel, NULL); ret = for_each_subchannel_staged(NULL, reprobe_subchannel, NULL);
CIO_MSG_EVENT(2, "reprobe done (rc=%d, need_reprobe=%d)\n", ret, CIO_MSG_EVENT(4, "reprobe done (rc=%d, need_reprobe=%d)\n", ret,
need_reprobe); need_reprobe);
} }
......
drivers/s390/cio/device.c
View file @ 139b83dd
...@@ -341,7 +341,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev) ...@@ -341,7 +341,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
rc = device_schedule_callback(&cdev->dev, rc = device_schedule_callback(&cdev->dev,
ccw_device_remove_orphan_cb); ccw_device_remove_orphan_cb);
if (rc) if (rc)
CIO_MSG_EVENT(2, "Couldn't unregister orphan " CIO_MSG_EVENT(0, "Couldn't unregister orphan "
"0.%x.%04x\n", "0.%x.%04x\n",
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
...@@ -351,7 +351,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev) ...@@ -351,7 +351,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
rc = device_schedule_callback(cdev->dev.parent, rc = device_schedule_callback(cdev->dev.parent,
ccw_device_remove_sch_cb); ccw_device_remove_sch_cb);
if (rc) if (rc)
CIO_MSG_EVENT(2, "Couldn't unregister disconnected device " CIO_MSG_EVENT(0, "Couldn't unregister disconnected device "
"0.%x.%04x\n", "0.%x.%04x\n",
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
...@@ -397,7 +397,7 @@ int ccw_device_set_offline(struct ccw_device *cdev) ...@@ -397,7 +397,7 @@ int ccw_device_set_offline(struct ccw_device *cdev)
if (ret == 0) if (ret == 0)
wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
else { else {
CIO_MSG_EVENT(2, "ccw_device_offline returned %d, " CIO_MSG_EVENT(0, "ccw_device_offline returned %d, "
"device 0.%x.%04x\n", "device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid, ret, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
...@@ -433,7 +433,7 @@ int ccw_device_set_online(struct ccw_device *cdev) ...@@ -433,7 +433,7 @@ int ccw_device_set_online(struct ccw_device *cdev)
if (ret == 0) if (ret == 0)
wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
else { else {
CIO_MSG_EVENT(2, "ccw_device_online returned %d, " CIO_MSG_EVENT(0, "ccw_device_online returned %d, "
"device 0.%x.%04x\n", "device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid, ret, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
...@@ -451,7 +451,7 @@ int ccw_device_set_online(struct ccw_device *cdev) ...@@ -451,7 +451,7 @@ int ccw_device_set_online(struct ccw_device *cdev)
if (ret == 0) if (ret == 0)
wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev)); wait_event(cdev->private->wait_q, dev_fsm_final_state(cdev));
else else
CIO_MSG_EVENT(2, "ccw_device_offline returned %d, " CIO_MSG_EVENT(0, "ccw_device_offline returned %d, "
"device 0.%x.%04x\n", "device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid, ret, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
...@@ -803,7 +803,7 @@ static void sch_attach_disconnected_device(struct subchannel *sch, ...@@ -803,7 +803,7 @@ static void sch_attach_disconnected_device(struct subchannel *sch,
other_sch = to_subchannel(get_device(cdev->dev.parent)); other_sch = to_subchannel(get_device(cdev->dev.parent));
ret = device_move(&cdev->dev, &sch->dev); ret = device_move(&cdev->dev, &sch->dev);
if (ret) { if (ret) {
CIO_MSG_EVENT(2, "Moving disconnected device 0.%x.%04x failed " CIO_MSG_EVENT(0, "Moving disconnected device 0.%x.%04x failed "
"(ret=%d)!\n", cdev->private->dev_id.ssid, "(ret=%d)!\n", cdev->private->dev_id.ssid,
cdev->private->dev_id.devno, ret); cdev->private->dev_id.devno, ret);
put_device(&other_sch->dev); put_device(&other_sch->dev);
...@@ -933,7 +933,7 @@ io_subchannel_register(struct work_struct *work) ...@@ -933,7 +933,7 @@ io_subchannel_register(struct work_struct *work)
ret = device_reprobe(&cdev->dev); ret = device_reprobe(&cdev->dev);
if (ret) if (ret)
/* We can't do much here. */ /* We can't do much here. */
CIO_MSG_EVENT(2, "device_reprobe() returned" CIO_MSG_EVENT(0, "device_reprobe() returned"
" %d for 0.%x.%04x\n", ret, " %d for 0.%x.%04x\n", ret,
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
...@@ -1086,7 +1086,7 @@ static void ccw_device_move_to_sch(struct work_struct *work) ...@@ -1086,7 +1086,7 @@ static void ccw_device_move_to_sch(struct work_struct *work)
rc = device_move(&cdev->dev, &sch->dev); rc = device_move(&cdev->dev, &sch->dev);
mutex_unlock(&sch->reg_mutex); mutex_unlock(&sch->reg_mutex);
if (rc) { if (rc) {
CIO_MSG_EVENT(2, "Moving device 0.%x.%04x to subchannel " CIO_MSG_EVENT(0, "Moving device 0.%x.%04x to subchannel "
"0.%x.%04x failed (ret=%d)!\n", "0.%x.%04x failed (ret=%d)!\n",
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno, sch->schid.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
...@@ -1446,8 +1446,7 @@ ccw_device_remove (struct device *dev) ...@@ -1446,8 +1446,7 @@ ccw_device_remove (struct device *dev)
wait_event(cdev->private->wait_q, wait_event(cdev->private->wait_q,
dev_fsm_final_state(cdev)); dev_fsm_final_state(cdev));
else else
//FIXME: we can't fail! CIO_MSG_EVENT(0, "ccw_device_offline returned %d, "
CIO_MSG_EVENT(2, "ccw_device_offline returned %d, "
"device 0.%x.%04x\n", "device 0.%x.%04x\n",
ret, cdev->private->dev_id.ssid, ret, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
...@@ -1524,7 +1523,7 @@ static int recovery_check(struct device *dev, void *data) ...@@ -1524,7 +1523,7 @@ static int recovery_check(struct device *dev, void *data)
spin_lock_irq(cdev->ccwlock); spin_lock_irq(cdev->ccwlock);
switch (cdev->private->state) { switch (cdev->private->state) {
case DEV_STATE_DISCONNECTED: case DEV_STATE_DISCONNECTED:
CIO_MSG_EVENT(3, "recovery: trigger 0.%x.%04x\n", CIO_MSG_EVENT(4, "recovery: trigger 0.%x.%04x\n",
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
dev_fsm_event(cdev, DEV_EVENT_VERIFY); dev_fsm_event(cdev, DEV_EVENT_VERIFY);
...@@ -1554,7 +1553,7 @@ static void recovery_work_func(struct work_struct *unused) ...@@ -1554,7 +1553,7 @@ static void recovery_work_func(struct work_struct *unused)
} }
spin_unlock_irq(&recovery_lock); spin_unlock_irq(&recovery_lock);
} else } else
CIO_MSG_EVENT(2, "recovery: end\n"); CIO_MSG_EVENT(4, "recovery: end\n");
} }
static DECLARE_WORK(recovery_work, recovery_work_func); static DECLARE_WORK(recovery_work, recovery_work_func);
...@@ -1572,7 +1571,7 @@ void ccw_device_schedule_recovery(void) ...@@ -1572,7 +1571,7 @@ void ccw_device_schedule_recovery(void)
{ {
unsigned long flags; unsigned long flags;
CIO_MSG_EVENT(2, "recovery: schedule\n"); CIO_MSG_EVENT(4, "recovery: schedule\n");
spin_lock_irqsave(&recovery_lock, flags); spin_lock_irqsave(&recovery_lock, flags);
if (!timer_pending(&recovery_timer) || (recovery_phase != 0)) { if (!timer_pending(&recovery_timer) || (recovery_phase != 0)) {
recovery_phase = 0; recovery_phase = 0;
......
drivers/s390/cio/device_fsm.c
View file @ 139b83dd
...@@ -322,9 +322,9 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) ...@@ -322,9 +322,9 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
same_dev = 0; /* Keep the compiler quiet... */ same_dev = 0; /* Keep the compiler quiet... */
switch (state) { switch (state) {
case DEV_STATE_NOT_OPER: case DEV_STATE_NOT_OPER:
CIO_DEBUG(KERN_WARNING, 2, CIO_MSG_EVENT(2, "SenseID : unknown device %04x on "
"SenseID : unknown device %04x on subchannel " "subchannel 0.%x.%04x\n",
"0.%x.%04x\n", cdev->private->dev_id.devno, cdev->private->dev_id.devno,
sch->schid.ssid, sch->schid.sch_no); sch->schid.ssid, sch->schid.sch_no);
break; break;
case DEV_STATE_OFFLINE: case DEV_STATE_OFFLINE:
...@@ -348,8 +348,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) ...@@ -348,8 +348,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
return; return;
} }
/* Issue device info message. */ /* Issue device info message. */
CIO_DEBUG(KERN_INFO, 2, CIO_MSG_EVENT(4, "SenseID : device 0.%x.%04x reports: "
"SenseID : device 0.%x.%04x reports: "
"CU Type/Mod = %04X/%02X, Dev Type/Mod = " "CU Type/Mod = %04X/%02X, Dev Type/Mod = "
"%04X/%02X\n", "%04X/%02X\n",
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
...@@ -358,9 +357,9 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) ...@@ -358,9 +357,9 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
cdev->id.dev_type, cdev->id.dev_model); cdev->id.dev_type, cdev->id.dev_model);
break; break;
case DEV_STATE_BOXED: case DEV_STATE_BOXED:
CIO_DEBUG(KERN_WARNING, 2, CIO_MSG_EVENT(0, "SenseID : boxed device %04x on "
"SenseID : boxed device %04x on subchannel " " subchannel 0.%x.%04x\n",
"0.%x.%04x\n", cdev->private->dev_id.devno, cdev->private->dev_id.devno,
sch->schid.ssid, sch->schid.sch_no); sch->schid.ssid, sch->schid.sch_no);
break; break;
} }
...@@ -443,8 +442,7 @@ ccw_device_done(struct ccw_device *cdev, int state) ...@@ -443,8 +442,7 @@ ccw_device_done(struct ccw_device *cdev, int state)
if (state == DEV_STATE_BOXED) if (state == DEV_STATE_BOXED)
CIO_DEBUG(KERN_WARNING, 2, CIO_MSG_EVENT(0, "Boxed device %04x on subchannel %04x\n",
"Boxed device %04x on subchannel %04x\n",
cdev->private->dev_id.devno, sch->schid.sch_no); cdev->private->dev_id.devno, sch->schid.sch_no);
if (cdev->private->flags.donotify) { if (cdev->private->flags.donotify) {
...@@ -900,7 +898,7 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event) ...@@ -900,7 +898,7 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
/* Basic sense hasn't started. Try again. */ /* Basic sense hasn't started. Try again. */
ccw_device_do_sense(cdev, irb); ccw_device_do_sense(cdev, irb);
else { else {
CIO_MSG_EVENT(2, "Huh? 0.%x.%04x: unsolicited " CIO_MSG_EVENT(0, "0.%x.%04x: unsolicited "
"interrupt during w4sense...\n", "interrupt during w4sense...\n",
cdev->private->dev_id.ssid, cdev->private->dev_id.ssid,
cdev->private->dev_id.devno); cdev->private->dev_id.devno);
...@@ -1169,8 +1167,10 @@ ccw_device_nop(struct ccw_device *cdev, enum dev_event dev_event) ...@@ -1169,8 +1167,10 @@ ccw_device_nop(struct ccw_device *cdev, enum dev_event dev_event)
static void static void
ccw_device_bug(struct ccw_device *cdev, enum dev_event dev_event) ccw_device_bug(struct ccw_device *cdev, enum dev_event dev_event)
{ {
CIO_MSG_EVENT(0, "dev_jumptable[%i][%i] == NULL\n", CIO_MSG_EVENT(0, "Internal state [%i][%i] not handled for device "
cdev->private->state, dev_event); "0.%x.%04x\n", cdev->private->state, dev_event,
cdev->private->dev_id.ssid,
cdev->private->dev_id.devno);
BUG(); BUG();
} }
......
drivers/s390/cio/device_id.c
View file @ 139b83dd
...@@ -214,7 +214,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev) ...@@ -214,7 +214,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
* sense id information. So, for intervention required, * sense id information. So, for intervention required,
* we use the "whack it until it talks" strategy... * we use the "whack it until it talks" strategy...
*/ */
CIO_MSG_EVENT(2, "SenseID : device %04x on Subchannel " CIO_MSG_EVENT(0, "SenseID : device %04x on Subchannel "
"0.%x.%04x reports cmd reject\n", "0.%x.%04x reports cmd reject\n",
cdev->private->dev_id.devno, sch->schid.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
sch->schid.sch_no); sch->schid.sch_no);
...@@ -239,7 +239,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev) ...@@ -239,7 +239,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
lpm = to_io_private(sch)->orb.lpm; lpm = to_io_private(sch)->orb.lpm;
if ((lpm & sch->schib.pmcw.pim & sch->schib.pmcw.pam) != 0) if ((lpm & sch->schib.pmcw.pim & sch->schib.pmcw.pam) != 0)
CIO_MSG_EVENT(2, "SenseID : path %02X for device %04x " CIO_MSG_EVENT(4, "SenseID : path %02X for device %04x "
"on subchannel 0.%x.%04x is " "on subchannel 0.%x.%04x is "
"'not operational'\n", lpm, "'not operational'\n", lpm,
cdev->private->dev_id.devno, cdev->private->dev_id.devno,
......
drivers/s390/cio/device_pgid.c
View file @ 139b83dd
...@@ -79,7 +79,7 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev) ...@@ -79,7 +79,7 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev)
/* ret is 0, -EBUSY, -EACCES or -ENODEV */ /* ret is 0, -EBUSY, -EACCES or -ENODEV */
if (ret != -EACCES) if (ret != -EACCES)
return ret; return ret;
CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel " CIO_MSG_EVENT(3, "SNID - Device %04x on Subchannel "
"0.%x.%04x, lpm %02X, became 'not " "0.%x.%04x, lpm %02X, became 'not "
"operational'\n", "operational'\n",
cdev->private->dev_id.devno, cdev->private->dev_id.devno,
...@@ -159,7 +159,7 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev) ...@@ -159,7 +159,7 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)
u8 lpm; u8 lpm;
lpm = to_io_private(sch)->orb.lpm; lpm = to_io_private(sch)->orb.lpm;
CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel 0.%x.%04x," CIO_MSG_EVENT(3, "SNID - Device %04x on Subchannel 0.%x.%04x,"
" lpm %02X, became 'not operational'\n", " lpm %02X, became 'not operational'\n",
cdev->private->dev_id.devno, sch->schid.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
sch->schid.sch_no, lpm); sch->schid.sch_no, lpm);
...@@ -275,7 +275,7 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func) ...@@ -275,7 +275,7 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)
return ret; return ret;
} }
/* PGID command failed on this path. */ /* PGID command failed on this path. */
CIO_MSG_EVENT(2, "SPID - Device %04x on Subchannel " CIO_MSG_EVENT(3, "SPID - Device %04x on Subchannel "
"0.%x.%04x, lpm %02X, became 'not operational'\n", "0.%x.%04x, lpm %02X, became 'not operational'\n",
cdev->private->dev_id.devno, sch->schid.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
sch->schid.sch_no, cdev->private->imask); sch->schid.sch_no, cdev->private->imask);
...@@ -317,7 +317,7 @@ static int __ccw_device_do_nop(struct ccw_device *cdev) ...@@ -317,7 +317,7 @@ static int __ccw_device_do_nop(struct ccw_device *cdev)
return ret; return ret;
} }
/* nop command failed on this path. */ /* nop command failed on this path. */
CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel " CIO_MSG_EVENT(3, "NOP - Device %04x on Subchannel "
"0.%x.%04x, lpm %02X, became 'not operational'\n", "0.%x.%04x, lpm %02X, became 'not operational'\n",
cdev->private->dev_id.devno, sch->schid.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
sch->schid.sch_no, cdev->private->imask); sch->schid.sch_no, cdev->private->imask);
...@@ -362,7 +362,7 @@ __ccw_device_check_pgid(struct ccw_device *cdev) ...@@ -362,7 +362,7 @@ __ccw_device_check_pgid(struct ccw_device *cdev)
return -EAGAIN; return -EAGAIN;
} }
if (irb->scsw.cc == 3) { if (irb->scsw.cc == 3) {
CIO_MSG_EVENT(2, "SPID - Device %04x on Subchannel 0.%x.%04x," CIO_MSG_EVENT(3, "SPID - Device %04x on Subchannel 0.%x.%04x,"
" lpm %02X, became 'not operational'\n", " lpm %02X, became 'not operational'\n",
cdev->private->dev_id.devno, sch->schid.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
sch->schid.sch_no, cdev->private->imask); sch->schid.sch_no, cdev->private->imask);
...@@ -391,7 +391,7 @@ static int __ccw_device_check_nop(struct ccw_device *cdev) ...@@ -391,7 +391,7 @@ static int __ccw_device_check_nop(struct ccw_device *cdev)
return -ETIME; return -ETIME;
} }
if (irb->scsw.cc == 3) { if (irb->scsw.cc == 3) {
CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel 0.%x.%04x," CIO_MSG_EVENT(3, "NOP - Device %04x on Subchannel 0.%x.%04x,"
" lpm %02X, became 'not operational'\n", " lpm %02X, became 'not operational'\n",
cdev->private->dev_id.devno, sch->schid.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
sch->schid.sch_no, cdev->private->imask); sch->schid.sch_no, cdev->private->imask);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7