struct sbp2_device is replaced by struct sbp2_target and struct sbp2_logical_unit. This prepares support of multiple logical units per target. Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> --- update: small simplifications drivers/firewire/fw-sbp2.c | 355 ++++++++++++++++++------------------- 1 file changed, 179 insertions(+), 176 deletions(-) Index: linux/drivers/firewire/fw-sbp2.c =================================================================== --- linux.orig/drivers/firewire/fw-sbp2.c +++ linux/drivers/firewire/fw-sbp2.c @@ -69,32 +69,40 @@ typedef void (*scsi_done_fn_t)(struct sc static const char sbp2_driver_name[] = "sbp2"; -struct sbp2_device { - struct kref kref; - struct fw_unit *unit; +struct sbp2_logical_unit { + struct sbp2_target *tgt; + struct scsi_device *sdev; struct fw_address_handler address_handler; struct list_head orb_list; - struct scsi_device *sdev; - u64 management_agent_address; + u64 command_block_agent_address; - u32 workarounds; + u16 lun; int login_id; /* - * We cache these addresses and only update them once we've - * logged in or reconnected to the sbp2 device. That way, any - * IO to the device will automatically fail and get retried if - * it happens in a window where the device is not ready to - * handle it (e.g. after a bus reset but before we reconnect). + * The generation is updated once we've logged in or reconnected to the + * logical unit. Thus, I/O to the device will automatically fail and + * get retried if it happens in a window where the device is not ready, + * e.g. after a bus reset but before we reconnect. */ - int node_id; - int address_high; int generation; - int retries; struct delayed_work work; }; +struct sbp2_target { + struct kref kref; + struct fw_unit *unit; + + u64 management_agent_address; + int node_id; + int address_high; + + unsigned workarounds; + int starget_id; + struct sbp2_logical_unit lu[1]; +}; + #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 #define SBP2_MAX_SECTORS 255 /* Max sectors supported */ #define SBP2_ORB_TIMEOUT 2000 /* Timeout in ms */ @@ -219,7 +227,7 @@ struct sbp2_command_orb { } request; struct scsi_cmnd *cmd; scsi_done_fn_t done; - struct fw_unit *unit; + struct sbp2_logical_unit *lu; struct sbp2_pointer page_table[SG_ALL] __attribute__((aligned(8))); dma_addr_t page_table_bus; @@ -287,7 +295,7 @@ sbp2_status_write(struct fw_card *card, unsigned long long offset, void *payload, size_t length, void *callback_data) { - struct sbp2_device *sd = callback_data; + struct sbp2_logical_unit *lu = callback_data; struct sbp2_orb *orb, *next; struct sbp2_status status; size_t header_size; @@ -312,7 +320,7 @@ sbp2_status_write(struct fw_card *card, /* Lookup the orb corresponding to this status write. */ spin_lock_irqsave(&card->lock, flags); - list_for_each_entry_safe(orb, next, &sd->orb_list, link) { + list_for_each_entry_safe(orb, next, &lu->orb_list, link) { if (STATUS_GET_ORB_HIGH(status) == 0 && STATUS_GET_ORB_LOW(status) == orb->request_bus && orb->rcode == RCODE_COMPLETE) { @@ -348,11 +356,10 @@ complete_transaction(struct fw_card *car } static void -sbp2_send_orb(struct sbp2_orb *orb, struct fw_unit *unit, +sbp2_send_orb(struct sbp2_orb *orb, struct sbp2_logical_unit *lu, int node_id, int generation, u64 offset) { - struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_device *sd = unit->device.driver_data; + struct fw_device *device = fw_device(lu->tgt->unit->device.parent); unsigned long flags; orb->pointer.high = 0; @@ -360,7 +367,7 @@ sbp2_send_orb(struct sbp2_orb *orb, stru fw_memcpy_to_be32(&orb->pointer, &orb->pointer, sizeof(orb->pointer)); spin_lock_irqsave(&device->card->lock, flags); - list_add_tail(&orb->link, &sd->orb_list); + list_add_tail(&orb->link, &lu->orb_list); spin_unlock_irqrestore(&device->card->lock, flags); fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST, @@ -369,10 +376,9 @@ sbp2_send_orb(struct sbp2_orb *orb, stru complete_transaction, orb); } -static int sbp2_cancel_orbs(struct fw_unit *unit) +static int sbp2_cancel_orbs(struct sbp2_logical_unit *lu) { - struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_device *sd = unit->device.driver_data; + struct fw_device *device = fw_device(lu->tgt->unit->device.parent); struct sbp2_orb *orb, *next; struct list_head list; unsigned long flags; @@ -380,7 +386,7 @@ static int sbp2_cancel_orbs(struct fw_un INIT_LIST_HEAD(&list); spin_lock_irqsave(&device->card->lock, flags); - list_splice_init(&sd->orb_list, &list); + list_splice_init(&lu->orb_list, &list); spin_unlock_irqrestore(&device->card->lock, flags); list_for_each_entry_safe(orb, next, &list, link) { @@ -407,11 +413,11 @@ complete_management_orb(struct sbp2_orb } static int -sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation, - int function, int lun, void *response) +sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id, + int generation, int function, int lun_or_login_id, + void *response) { - struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_device *sd = unit->device.driver_data; + struct fw_device *device = fw_device(lu->tgt->unit->device.parent); struct sbp2_management_orb *orb; int retval = -ENOMEM; @@ -431,12 +437,12 @@ sbp2_send_management_orb(struct fw_unit orb->request.misc = MANAGEMENT_ORB_NOTIFY | MANAGEMENT_ORB_FUNCTION(function) | - MANAGEMENT_ORB_LUN(lun); + MANAGEMENT_ORB_LUN(lun_or_login_id); orb->request.length = MANAGEMENT_ORB_RESPONSE_LENGTH(sizeof(orb->response)); - orb->request.status_fifo.high = sd->address_handler.offset >> 32; - orb->request.status_fifo.low = sd->address_handler.offset; + orb->request.status_fifo.high = lu->address_handler.offset >> 32; + orb->request.status_fifo.low = lu->address_handler.offset; if (function == SBP2_LOGIN_REQUEST) { orb->request.misc |= @@ -455,14 +461,14 @@ sbp2_send_management_orb(struct fw_unit if (dma_mapping_error(orb->base.request_bus)) goto fail_mapping_request; - sbp2_send_orb(&orb->base, unit, - node_id, generation, sd->management_agent_address); + sbp2_send_orb(&orb->base, lu, node_id, generation, + lu->tgt->management_agent_address); wait_for_completion_timeout(&orb->done, msecs_to_jiffies(SBP2_ORB_TIMEOUT)); retval = -EIO; - if (sbp2_cancel_orbs(unit) == 0) { + if (sbp2_cancel_orbs(lu) == 0) { fw_error("orb reply timed out, rcode=0x%02x\n", orb->base.rcode); goto out; @@ -507,10 +513,9 @@ complete_agent_reset_write(struct fw_car kfree(t); } -static int sbp2_agent_reset(struct fw_unit *unit) +static int sbp2_agent_reset(struct sbp2_logical_unit *lu) { - struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_device *sd = unit->device.driver_data; + struct fw_device *device = fw_device(lu->tgt->unit->device.parent); struct fw_transaction *t; static u32 zero; @@ -519,132 +524,138 @@ static int sbp2_agent_reset(struct fw_un return -ENOMEM; fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST, - sd->node_id, sd->generation, device->max_speed, - sd->command_block_agent_address + SBP2_AGENT_RESET, + lu->tgt->node_id, lu->generation, device->max_speed, + lu->command_block_agent_address + SBP2_AGENT_RESET, &zero, sizeof(zero), complete_agent_reset_write, t); return 0; } +/* FIXME: Loop over logical units */ static void release_sbp2_device(struct kref *kref) { - struct sbp2_device *sd = container_of(kref, struct sbp2_device, kref); + struct sbp2_target *tgt = container_of(kref, struct sbp2_target, kref); + struct sbp2_logical_unit *lu = tgt->lu; - if (sd->sdev) - scsi_remove_device(sd->sdev); + if (lu->sdev) + scsi_remove_device(lu->sdev); - sbp2_send_management_orb(sd->unit, sd->node_id, sd->generation, - SBP2_LOGOUT_REQUEST, sd->login_id, NULL); - fw_core_remove_address_handler(&sd->address_handler); - fw_notify("removed sbp2 unit %s\n", sd->unit->device.bus_id); - put_device(&sd->unit->device); - kfree(sd); + sbp2_send_management_orb(lu, tgt->node_id, lu->generation, + SBP2_LOGOUT_REQUEST, lu->login_id, NULL); + fw_core_remove_address_handler(&lu->address_handler); + fw_notify("removed sbp2 unit %s\n", tgt->unit->device.bus_id); + put_device(&tgt->unit->device); + kfree(tgt); } static void sbp2_reconnect(struct work_struct *work); static struct Scsi_Host *sbp2_shost; -static atomic_t sbp2_starget_id = ATOMIC_INIT(-1); static void sbp2_login(struct work_struct *work) { - struct sbp2_device *sd = - container_of(work, struct sbp2_device, work.work); - struct scsi_device *sdev; - struct fw_unit *unit = sd->unit; + 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); + int generation = device->card->generation; + int node_id = device->node->node_id; + int local_node_id = device->card->local_node->node_id; + struct scsi_device *sdev; + struct scsi_lun eight_bytes_lun = {{ 0, }}; struct sbp2_login_response response; - int generation, node_id, local_node_id, lun; - - /* FIXME: Make this work for multi-lun devices. */ - lun = 0; - - generation = device->card->generation; - node_id = device->node->node_id; - local_node_id = device->card->local_node->node_id; - if (sbp2_send_management_orb(unit, node_id, generation, - SBP2_LOGIN_REQUEST, lun, &response) < 0) { - if (sd->retries++ < 5) { - schedule_delayed_work(&sd->work, DIV_ROUND_UP(HZ, 5)); + if (sbp2_send_management_orb(lu, node_id, generation, + SBP2_LOGIN_REQUEST, lu->lun, &response) < 0) { + if (lu->retries++ < 5) { + schedule_delayed_work(&lu->work, DIV_ROUND_UP(HZ, 5)); } else { - fw_error("failed to login to %s\n", - unit->device.bus_id); - kref_put(&sd->kref, release_sbp2_device); + fw_error("failed to login to %s LUN %04x\n", + unit->device.bus_id, lu->lun); + kref_put(&lu->tgt->kref, release_sbp2_device); } return; } - sd->generation = generation; - sd->node_id = node_id; - sd->address_high = local_node_id << 16; + lu->generation = generation; + lu->tgt->node_id = node_id; + lu->tgt->address_high = local_node_id << 16; /* Get command block agent offset and login id. */ - sd->command_block_agent_address = + lu->command_block_agent_address = ((u64) (response.command_block_agent.high & 0xffff) << 32) | response.command_block_agent.low; - sd->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); + lu->login_id = LOGIN_RESPONSE_GET_LOGIN_ID(response); - fw_notify("logged in to sbp2 unit %s (%d retries)\n", - unit->device.bus_id, sd->retries); + fw_notify("logged in to sbp2 unit %s LUN %04x (%d retries)\n", + unit->device.bus_id, lu->lun, lu->retries); fw_notify(" - management_agent_address: 0x%012llx\n", - (unsigned long long) sd->management_agent_address); + (unsigned long long) lu->tgt->management_agent_address); fw_notify(" - command_block_agent_address: 0x%012llx\n", - (unsigned long long) sd->command_block_agent_address); + (unsigned long long) lu->command_block_agent_address); fw_notify(" - status write address: 0x%012llx\n", - (unsigned long long) sd->address_handler.offset); + (unsigned long long) lu->address_handler.offset); #if 0 /* FIXME: The linux1394 sbp2 does this last step. */ sbp2_set_busy_timeout(scsi_id); #endif - PREPARE_DELAYED_WORK(&sd->work, sbp2_reconnect); - sbp2_agent_reset(unit); + PREPARE_DELAYED_WORK(&lu->work, sbp2_reconnect); + sbp2_agent_reset(lu); - sdev = __scsi_add_device(sbp2_shost, 0, - atomic_inc_return(&sbp2_starget_id), lun, sd); + eight_bytes_lun.scsi_lun[0] = (lu->lun >> 8) & 0xff; + eight_bytes_lun.scsi_lun[1] = lu->lun & 0xff; + sdev = __scsi_add_device(sbp2_shost, 0, lu->tgt->starget_id, + scsilun_to_int(&eight_bytes_lun), lu); if (IS_ERR(sdev)) { - sbp2_send_management_orb(unit, sd->node_id, sd->generation, - SBP2_LOGOUT_REQUEST, sd->login_id, - NULL); + sbp2_send_management_orb(lu, node_id, generation, + SBP2_LOGOUT_REQUEST, lu->login_id, NULL); /* * Set this back to sbp2_login so we fall back and * retry login on bus reset. */ - PREPARE_DELAYED_WORK(&sd->work, sbp2_login); + PREPARE_DELAYED_WORK(&lu->work, sbp2_login); } else { - sd->sdev = sdev; + lu->sdev = sdev; scsi_device_put(sdev); } - kref_put(&sd->kref, release_sbp2_device); + kref_put(&lu->tgt->kref, release_sbp2_device); } +static atomic_t sbp2_starget_id = ATOMIC_INIT(-1); + /* FIXME: Loop over luns here. */ static int sbp2_probe(struct device *dev) { struct fw_unit *unit = fw_unit(dev); struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_device *sd; + struct sbp2_target *tgt; + struct sbp2_logical_unit *lu; struct fw_csr_iterator ci; int i, key, value, error; u32 model, firmware_revision; error = -ENOMEM; - sd = kzalloc(sizeof(*sd), GFP_KERNEL); - if (!sd) + tgt = kzalloc(sizeof(*tgt), GFP_KERNEL); + if (!tgt) goto out_error; - unit->device.driver_data = sd; - sd->unit = unit; - INIT_LIST_HEAD(&sd->orb_list); - kref_init(&sd->kref); - - sd->address_handler.length = 0x100; - sd->address_handler.address_callback = sbp2_status_write; - sd->address_handler.callback_data = sd; + unit->device.driver_data = tgt; + tgt->unit = unit; + kref_init(&tgt->kref); + tgt->starget_id = atomic_inc_return(&sbp2_starget_id); + + lu = tgt->lu; + lu->tgt = tgt; + lu->lun = 0; + INIT_LIST_HEAD(&lu->orb_list); + + lu->address_handler.length = 0x100; + lu->address_handler.address_callback = sbp2_status_write; + lu->address_handler.callback_data = lu; - error = fw_core_add_address_handler(&sd->address_handler, + error = fw_core_add_address_handler(&lu->address_handler, &fw_high_memory_region); if (error < 0) goto out_free; @@ -664,7 +675,7 @@ static int sbp2_probe(struct device *dev while (fw_csr_iterator_next(&ci, &key, &value)) { switch (key) { case CSR_DEPENDENT_INFO | CSR_OFFSET: - sd->management_agent_address = + tgt->management_agent_address = 0xfffff0000000ULL + 4 * value; break; case SBP2_FIRMWARE_REVISION: @@ -683,33 +694,32 @@ static int sbp2_probe(struct device *dev if (sbp2_workarounds_table[i].model != model && sbp2_workarounds_table[i].model != ~0) continue; - sd->workarounds |= sbp2_workarounds_table[i].workarounds; + tgt->workarounds |= sbp2_workarounds_table[i].workarounds; break; } - if (sd->workarounds) + if (tgt->workarounds) fw_notify("Workarounds for node %s: 0x%x " "(firmware_revision 0x%06x, model_id 0x%06x)\n", unit->device.bus_id, - sd->workarounds, firmware_revision, model); + tgt->workarounds, firmware_revision, model); get_device(&unit->device); /* - * We schedule work to do the login so we can easily - * reschedule retries. Always get the ref before scheduling - * work. + * We schedule work to do the login so we can easily reschedule retries. + * Always get the ref when scheduling work. */ - INIT_DELAYED_WORK(&sd->work, sbp2_login); - if (schedule_delayed_work(&sd->work, 0)) - kref_get(&sd->kref); + INIT_DELAYED_WORK(&lu->work, sbp2_login); + if (schedule_delayed_work(&lu->work, 0)) + kref_get(&tgt->kref); return 0; out_remove_address_handler: - fw_core_remove_address_handler(&sd->address_handler); + fw_core_remove_address_handler(&lu->address_handler); out_free: - kfree(sd); + kfree(tgt); out_error: return error; } @@ -717,18 +727,18 @@ static int sbp2_probe(struct device *dev static int sbp2_remove(struct device *dev) { struct fw_unit *unit = fw_unit(dev); - struct sbp2_device *sd = unit->device.driver_data; + struct sbp2_target *tgt = unit->device.driver_data; - kref_put(&sd->kref, release_sbp2_device); + kref_put(&tgt->kref, release_sbp2_device); return 0; } static void sbp2_reconnect(struct work_struct *work) { - struct sbp2_device *sd = - container_of(work, struct sbp2_device, work.work); - struct fw_unit *unit = sd->unit; + 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); int generation, node_id, local_node_id; @@ -736,40 +746,42 @@ static void sbp2_reconnect(struct work_s node_id = device->node->node_id; local_node_id = device->card->local_node->node_id; - if (sbp2_send_management_orb(unit, node_id, generation, + if (sbp2_send_management_orb(lu, node_id, generation, SBP2_RECONNECT_REQUEST, - sd->login_id, NULL) < 0) { - if (sd->retries++ >= 5) { + lu->login_id, NULL) < 0) { + if (lu->retries++ >= 5) { fw_error("failed to reconnect to %s\n", unit->device.bus_id); /* Fall back and try to log in again. */ - sd->retries = 0; - PREPARE_DELAYED_WORK(&sd->work, sbp2_login); + lu->retries = 0; + PREPARE_DELAYED_WORK(&lu->work, sbp2_login); } - schedule_delayed_work(&sd->work, DIV_ROUND_UP(HZ, 5)); + schedule_delayed_work(&lu->work, DIV_ROUND_UP(HZ, 5)); return; } - sd->generation = generation; - sd->node_id = node_id; - sd->address_high = local_node_id << 16; - - fw_notify("reconnected to unit %s (%d retries)\n", - unit->device.bus_id, sd->retries); - sbp2_agent_reset(unit); - sbp2_cancel_orbs(unit); - kref_put(&sd->kref, release_sbp2_device); + lu->generation = generation; + lu->tgt->node_id = node_id; + lu->tgt->address_high = local_node_id << 16; + + fw_notify("reconnected to unit %s LUN %04x (%d retries)\n", + unit->device.bus_id, lu->lun, lu->retries); + sbp2_agent_reset(lu); + sbp2_cancel_orbs(lu); + kref_put(&lu->tgt->kref, release_sbp2_device); } +/* FIXME: Loop over logical units */ static void sbp2_update(struct fw_unit *unit) { struct fw_device *device = fw_device(unit->device.parent); - struct sbp2_device *sd = unit->device.driver_data; + struct sbp2_target *tgt = unit->device.driver_data; + struct sbp2_logical_unit *lu = tgt->lu; - sd->retries = 0; + lu->retries = 0; fw_device_enable_phys_dma(device); - if (schedule_delayed_work(&sd->work, 0)) - kref_get(&sd->kref); + if (schedule_delayed_work(&lu->work, 0)) + kref_get(&tgt->kref); } #define SBP2_UNIT_SPEC_ID_ENTRY 0x0000609e @@ -839,13 +851,12 @@ complete_command_orb(struct sbp2_orb *ba { struct sbp2_command_orb *orb = container_of(base_orb, struct sbp2_command_orb, base); - struct fw_unit *unit = orb->unit; - struct fw_device *device = fw_device(unit->device.parent); + struct fw_device *device = fw_device(orb->lu->tgt->unit->device.parent); int result; if (status != NULL) { if (STATUS_GET_DEAD(*status)) - sbp2_agent_reset(unit); + sbp2_agent_reset(orb->lu); switch (STATUS_GET_RESPONSE(*status)) { case SBP2_STATUS_REQUEST_COMPLETE: @@ -890,11 +901,10 @@ complete_command_orb(struct sbp2_orb *ba kfree(orb); } -static int sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb) +static int +sbp2_map_scatterlist(struct sbp2_command_orb *orb, struct fw_device *device, + struct sbp2_logical_unit *lu) { - struct sbp2_device *sd = orb->cmd->device->hostdata; - struct fw_unit *unit = sd->unit; - struct fw_device *device = fw_device(unit->device.parent); struct scatterlist *sg; int sg_len, l, i, j, count; dma_addr_t sg_addr; @@ -913,10 +923,9 @@ static int sbp2_command_orb_map_scatterl * tables. */ if (count == 1 && sg_dma_len(sg) < SBP2_MAX_SG_ELEMENT_LENGTH) { - orb->request.data_descriptor.high = sd->address_high; + orb->request.data_descriptor.high = lu->tgt->address_high; orb->request.data_descriptor.low = sg_dma_address(sg); - orb->request.misc |= - COMMAND_ORB_DATA_SIZE(sg_dma_len(sg)); + orb->request.misc |= COMMAND_ORB_DATA_SIZE(sg_dma_len(sg)); return 0; } @@ -960,7 +969,7 @@ static int sbp2_command_orb_map_scatterl * initiator (i.e. us), but data_descriptor can refer to data * on other nodes so we need to put our ID in descriptor.high. */ - orb->request.data_descriptor.high = sd->address_high; + orb->request.data_descriptor.high = lu->tgt->address_high; orb->request.data_descriptor.low = orb->page_table_bus; orb->request.misc |= COMMAND_ORB_PAGE_TABLE_PRESENT | @@ -979,9 +988,8 @@ static int sbp2_command_orb_map_scatterl static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) { - struct sbp2_device *sd = cmd->device->hostdata; - struct fw_unit *unit = sd->unit; - struct fw_device *device = fw_device(unit->device.parent); + struct sbp2_logical_unit *lu = cmd->device->hostdata; + struct fw_device *device = fw_device(lu->tgt->unit->device.parent); struct sbp2_command_orb *orb; unsigned max_payload; @@ -1005,7 +1013,7 @@ static int sbp2_scsi_queuecommand(struct /* Initialize rcode to something not RCODE_COMPLETE. */ orb->base.rcode = -1; - orb->unit = unit; + orb->lu = lu; orb->done = done; orb->cmd = cmd; @@ -1031,7 +1039,7 @@ static int sbp2_scsi_queuecommand(struct orb->request.misc |= COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA); - if (scsi_sg_count(cmd) && sbp2_command_orb_map_scatterlist(orb) < 0) + if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0) goto fail_mapping; fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request)); @@ -1047,8 +1055,8 @@ static int sbp2_scsi_queuecommand(struct if (dma_mapping_error(orb->base.request_bus)) goto fail_mapping; - sbp2_send_orb(&orb->base, unit, sd->node_id, sd->generation, - sd->command_block_agent_address + SBP2_ORB_POINTER); + sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, lu->generation, + lu->command_block_agent_address + SBP2_ORB_POINTER); return 0; @@ -1060,32 +1068,31 @@ static int sbp2_scsi_queuecommand(struct static int sbp2_scsi_slave_alloc(struct scsi_device *sdev) { - struct sbp2_device *sd = sdev->hostdata; + unsigned workarounds = + ((struct sbp2_logical_unit *)sdev->hostdata)->tgt->workarounds; sdev->allow_restart = 1; - if (sd->workarounds & SBP2_WORKAROUND_INQUIRY_36) + if (workarounds & SBP2_WORKAROUND_INQUIRY_36) sdev->inquiry_len = 36; return 0; } static int sbp2_scsi_slave_configure(struct scsi_device *sdev) { - struct sbp2_device *sd = sdev->hostdata; - struct fw_unit *unit = sd->unit; + unsigned workarounds = + ((struct sbp2_logical_unit *)sdev->hostdata)->tgt->workarounds; sdev->use_10_for_rw = 1; if (sdev->type == TYPE_ROM) sdev->use_10_for_ms = 1; if (sdev->type == TYPE_DISK && - sd->workarounds & SBP2_WORKAROUND_MODE_SENSE_8) + workarounds & SBP2_WORKAROUND_MODE_SENSE_8) sdev->skip_ms_page_8 = 1; - if (sd->workarounds & SBP2_WORKAROUND_FIX_CAPACITY) { - fw_notify("setting fix_capacity for %s\n", unit->device.bus_id); + if (workarounds & SBP2_WORKAROUND_FIX_CAPACITY) sdev->fix_capacity = 1; - } - if (sd->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS) + if (workarounds & SBP2_WORKAROUND_128K_MAX_TRANS) blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512); return 0; } @@ -1096,12 +1103,11 @@ static int sbp2_scsi_slave_configure(str */ static int sbp2_scsi_abort(struct scsi_cmnd *cmd) { - struct sbp2_device *sd = cmd->device->hostdata; - struct fw_unit *unit = sd->unit; + struct sbp2_logical_unit *lu = cmd->device->hostdata; fw_notify("sbp2_scsi_abort\n"); - sbp2_agent_reset(unit); - sbp2_cancel_orbs(unit); + sbp2_agent_reset(lu); + sbp2_cancel_orbs(lu); return SUCCESS; } @@ -1118,17 +1124,17 @@ sbp2_sysfs_ieee1394_id_show(struct devic char *buf) { struct scsi_device *sdev = to_scsi_device(dev); - struct sbp2_device *sd; + struct sbp2_logical_unit *lu; struct fw_unit *unit; struct fw_device *device; u32 directory_id; struct fw_csr_iterator ci; - int key, value, lun; + int key, value; if (!sdev) return 0; - sd = sdev->hostdata; - unit = sd->unit; + lu = sdev->hostdata; + unit = lu->tgt->unit; device = fw_device(unit->device.parent); /* implicit directory ID */ @@ -1143,12 +1149,9 @@ sbp2_sysfs_ieee1394_id_show(struct devic break; } - /* FIXME: Make this work for multi-lun devices. */ - lun = 0; - return sprintf(buf, "%08x%08x:%06x:%04x\n", device->config_rom[3], device->config_rom[4], - directory_id, lun); + directory_id, lu->lun); } static DEVICE_ATTR(ieee1394_id, S_IRUGO, sbp2_sysfs_ieee1394_id_show, NULL); -- Stefan Richter -=====-=-=== -=== ===-= http://arcgraph.de/sr/ - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html