Skip to content

Commit

Permalink
firewire: fw-sbp2: log bus_id at management request failures
Browse files Browse the repository at this point in the history 
for easier readable logs if more than one SBP-2 device is present.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson@redhat.com>
  • Loading branch information
Stefan Richter committed Feb 16, 2008
1 parent e0e6021 commit 48f18c7
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions drivers/firewire/fw-sbp2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ struct sbp2_logical_unit {
struct sbp2_target {
struct kref kref;
struct fw_unit *unit;
const char *bus_id;
struct list_head lu_list;

u64 management_agent_address;
Expand Down Expand Up @@ -566,20 +567,20 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,

retval = -EIO;
if (sbp2_cancel_orbs(lu) == 0) {
fw_error("orb reply timed out, rcode=0x%02x\n",
orb->base.rcode);
fw_error("%s: orb reply timed out, rcode=0x%02x\n",
lu->tgt->bus_id, orb->base.rcode);
goto out;
}

if (orb->base.rcode != RCODE_COMPLETE) {
fw_error("management write failed, rcode 0x%02x\n",
orb->base.rcode);
fw_error("%s: management write failed, rcode 0x%02x\n",
lu->tgt->bus_id, orb->base.rcode);
goto out;
}

if (STATUS_GET_RESPONSE(orb->status) != 0 ||
STATUS_GET_SBP_STATUS(orb->status) != 0) {
fw_error("error status: %d:%d\n",
fw_error("%s: error status: %d:%d\n", lu->tgt->bus_id,
STATUS_GET_RESPONSE(orb->status),
STATUS_GET_SBP_STATUS(orb->status));
goto out;
Expand Down Expand Up @@ -664,7 +665,7 @@ static void sbp2_release_target(struct kref *kref)
kfree(lu);
}
scsi_remove_host(shost);
fw_notify("released %s\n", tgt->unit->device.bus_id);
fw_notify("released %s\n", tgt->bus_id);

put_device(&tgt->unit->device);
scsi_host_put(shost);
Expand Down Expand Up @@ -693,12 +694,11 @@ static void sbp2_login(struct work_struct *work)
{
struct sbp2_logical_unit *lu =
container_of(work, struct sbp2_logical_unit, work.work);
struct Scsi_Host *shost =
container_of((void *)lu->tgt, struct Scsi_Host, hostdata[0]);
struct sbp2_target *tgt = lu->tgt;
struct fw_device *device = fw_device(tgt->unit->device.parent);
struct Scsi_Host *shost;
struct scsi_device *sdev;
struct scsi_lun eight_bytes_lun;
struct fw_unit *unit = lu->tgt->unit;
struct fw_device *device = fw_device(unit->device.parent);
struct sbp2_login_response response;
int generation, node_id, local_node_id;

Expand All @@ -715,23 +715,23 @@ static void sbp2_login(struct work_struct *work)
if (lu->retries++ < 5)
sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5));
else
fw_error("failed to login to %s LUN %04x\n",
unit->device.bus_id, lu->lun);
fw_error("%s: failed to login to LUN %04x\n",
tgt->bus_id, lu->lun);
goto out;
}

lu->generation = generation;
lu->tgt->node_id = node_id;
lu->tgt->address_high = local_node_id << 16;
lu->generation = generation;
tgt->node_id = node_id;
tgt->address_high = local_node_id << 16;

/* Get command block agent offset and login id. */
lu->command_block_agent_address =
((u64) (response.command_block_agent.high & 0xffff) << 32) |
response.command_block_agent.low;
lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response);

fw_notify("logged in to %s LUN %04x (%d retries)\n",
unit->device.bus_id, lu->lun, lu->retries);
fw_notify("%s: logged in to LUN %04x (%d retries)\n",
tgt->bus_id, lu->lun, lu->retries);

#if 0
/* FIXME: The linux1394 sbp2 does this last step. */
Expand All @@ -747,6 +747,7 @@ static void sbp2_login(struct work_struct *work)
memset(&eight_bytes_lun, 0, sizeof(eight_bytes_lun));
eight_bytes_lun.scsi_lun[0] = (lu->lun >> 8) & 0xff;
eight_bytes_lun.scsi_lun[1] = lu->lun & 0xff;
shost = container_of((void *)tgt, struct Scsi_Host, hostdata[0]);

sdev = __scsi_add_device(shost, 0, 0,
scsilun_to_int(&eight_bytes_lun), lu);
Expand All @@ -767,7 +768,7 @@ static void sbp2_login(struct work_struct *work)
scsi_device_put(sdev);
}
out:
sbp2_target_put(lu->tgt);
sbp2_target_put(tgt);
}

static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry)
Expand Down Expand Up @@ -850,7 +851,7 @@ static int sbp2_scan_unit_dir(struct sbp2_target *tgt, u32 *directory,
if (timeout > tgt->mgt_orb_timeout)
fw_notify("%s: config rom contains %ds "
"management ORB timeout, limiting "
"to %ds\n", tgt->unit->device.bus_id,
"to %ds\n", tgt->bus_id,
timeout / 1000,
tgt->mgt_orb_timeout / 1000);
break;
Expand Down Expand Up @@ -878,7 +879,7 @@ static void sbp2_init_workarounds(struct sbp2_target *tgt, u32 model,
if (w)
fw_notify("Please notify linux1394-devel@lists.sourceforge.net "
"if you need the workarounds parameter for %s\n",
tgt->unit->device.bus_id);
tgt->bus_id);

if (w & SBP2_WORKAROUND_OVERRIDE)
goto out;
Expand All @@ -900,8 +901,7 @@ static void sbp2_init_workarounds(struct sbp2_target *tgt, u32 model,
if (w)
fw_notify("Workarounds for %s: 0x%x "
"(firmware_revision 0x%06x, model_id 0x%06x)\n",
tgt->unit->device.bus_id,
w, firmware_revision, model);
tgt->bus_id, w, firmware_revision, model);
tgt->workarounds = w;
}

Expand All @@ -925,6 +925,7 @@ static int sbp2_probe(struct device *dev)
tgt->unit = unit;
kref_init(&tgt->kref);
INIT_LIST_HEAD(&tgt->lu_list);
tgt->bus_id = unit->device.bus_id;

if (fw_device_enable_phys_dma(device) < 0)
goto fail_shost_put;
Expand Down Expand Up @@ -975,8 +976,8 @@ static void sbp2_reconnect(struct work_struct *work)
{
struct sbp2_logical_unit *lu =
container_of(work, struct sbp2_logical_unit, work.work);
struct fw_unit *unit = lu->tgt->unit;
struct fw_device *device = fw_device(unit->device.parent);
struct sbp2_target *tgt = lu->tgt;
struct fw_device *device = fw_device(tgt->unit->device.parent);
int generation, node_id, local_node_id;

if (fw_device_is_shutdown(device))
Expand All @@ -991,8 +992,7 @@ static void sbp2_reconnect(struct work_struct *work)
SBP2_RECONNECT_REQUEST,
lu->login_id, NULL) < 0) {
if (lu->retries++ >= 5) {
fw_error("failed to reconnect to %s\n",
unit->device.bus_id);
fw_error("%s: failed to reconnect\n", tgt->bus_id);
/* Fall back and try to log in again. */
lu->retries = 0;
PREPARE_DELAYED_WORK(&lu->work, sbp2_login);
Expand All @@ -1001,17 +1001,17 @@ static void sbp2_reconnect(struct work_struct *work)
goto out;
}

lu->generation = generation;
lu->tgt->node_id = node_id;
lu->tgt->address_high = local_node_id << 16;
lu->generation = generation;
tgt->node_id = node_id;
tgt->address_high = local_node_id << 16;

fw_notify("reconnected to %s LUN %04x (%d retries)\n",
unit->device.bus_id, lu->lun, lu->retries);
fw_notify("%s: reconnected to LUN %04x (%d retries)\n",
tgt->bus_id, lu->lun, lu->retries);

sbp2_agent_reset(lu);
sbp2_cancel_orbs(lu);
out:
sbp2_target_put(lu->tgt);
sbp2_target_put(tgt);
}

static void sbp2_update(struct fw_unit *unit)
Expand Down Expand Up @@ -1359,7 +1359,7 @@ static int sbp2_scsi_abort(struct scsi_cmnd *cmd)
{
struct sbp2_logical_unit *lu = cmd->device->hostdata;

fw_notify("sbp2_scsi_abort\n");
fw_notify("%s: sbp2_scsi_abort\n", lu->tgt->bus_id);
sbp2_agent_reset(lu);
sbp2_cancel_orbs(lu);

Expand Down

0 comments on commit 48f18c7

Please sign in to comment.