Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 37281
b: refs/heads/master
c: 6065772
h: refs/heads/master
i:
  37279: 6224c0e
v: v3
  • Loading branch information
Stefan Richter committed Sep 17, 2006
1 parent 98d9090 commit 164c0f0
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 47 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e98eab46d1a482532c653bdb0c006413654d171
refs/heads/master: 6065772d54a3b994b9b5d3df6413ec6a1c8c2ec1
70 changes: 30 additions & 40 deletions trunk/drivers/ieee1394/sbp2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1201,11 +1201,8 @@ static int sbp2_query_logins(struct scsi_id_instance_data *scsi_id)
return -EIO;
}

if (STATUS_GET_RESP(scsi_id->status_block.ORB_offset_hi_misc) ||
STATUS_GET_DEAD_BIT(scsi_id->status_block.ORB_offset_hi_misc) ||
STATUS_GET_SBP_STATUS(scsi_id->status_block.ORB_offset_hi_misc)) {

SBP2_INFO("Error querying logins to SBP-2 device - timed out");
if (STATUS_TEST_RDS(scsi_id->status_block.ORB_offset_hi_misc)) {
SBP2_INFO("Error querying logins to SBP-2 device - failed");
return -EIO;
}

Expand Down Expand Up @@ -1298,18 +1295,12 @@ static int sbp2_login_device(struct scsi_id_instance_data *scsi_id)
* Sanity. Make sure status returned matches login orb.
*/
if (scsi_id->status_block.ORB_offset_lo != scsi_id->login_orb_dma) {
SBP2_ERR("Error logging into SBP-2 device - login timed-out");
SBP2_ERR("Error logging into SBP-2 device - timed out");
return -EIO;
}

/*
* Check status
*/
if (STATUS_GET_RESP(scsi_id->status_block.ORB_offset_hi_misc) ||
STATUS_GET_DEAD_BIT(scsi_id->status_block.ORB_offset_hi_misc) ||
STATUS_GET_SBP_STATUS(scsi_id->status_block.ORB_offset_hi_misc)) {

SBP2_ERR("Error logging into SBP-2 device - login failed");
if (STATUS_TEST_RDS(scsi_id->status_block.ORB_offset_hi_misc)) {
SBP2_ERR("Error logging into SBP-2 device - failed");
return -EIO;
}

Expand All @@ -1333,9 +1324,7 @@ static int sbp2_login_device(struct scsi_id_instance_data *scsi_id)
scsi_id->sbp2_command_block_agent_addr &= 0x0000ffffffffffffULL;

SBP2_INFO("Logged into SBP-2 device");

return 0;

}

/*
Expand Down Expand Up @@ -1466,25 +1455,17 @@ static int sbp2_reconnect_device(struct scsi_id_instance_data *scsi_id)
* Sanity. Make sure status returned matches reconnect orb.
*/
if (scsi_id->status_block.ORB_offset_lo != scsi_id->reconnect_orb_dma) {
SBP2_ERR("Error reconnecting to SBP-2 device - reconnect timed-out");
SBP2_ERR("Error reconnecting to SBP-2 device - timed out");
return -EIO;
}

/*
* Check status
*/
if (STATUS_GET_RESP(scsi_id->status_block.ORB_offset_hi_misc) ||
STATUS_GET_DEAD_BIT(scsi_id->status_block.ORB_offset_hi_misc) ||
STATUS_GET_SBP_STATUS(scsi_id->status_block.ORB_offset_hi_misc)) {

SBP2_ERR("Error reconnecting to SBP-2 device - reconnect failed");
if (STATUS_TEST_RDS(scsi_id->status_block.ORB_offset_hi_misc)) {
SBP2_ERR("Error reconnecting to SBP-2 device - failed");
return -EIO;
}

HPSB_DEBUG("Reconnected to SBP-2 device");

return 0;

}

/*
Expand Down Expand Up @@ -2115,18 +2096,19 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,

sbp2util_packet_dump(data, length, "sbp2 status write by device", (u32)addr);

if (!host) {
if (unlikely(length < 8 || length > sizeof(struct sbp2_status_block))) {
SBP2_ERR("Wrong size of status block");
return RCODE_ADDRESS_ERROR;
}
if (unlikely(!host)) {
SBP2_ERR("host is NULL - this is bad!");
return RCODE_ADDRESS_ERROR;
}

hi = hpsb_get_hostinfo(&sbp2_highlevel, host);

if (!hi) {
if (unlikely(!hi)) {
SBP2_ERR("host info is NULL - this is bad!");
return RCODE_ADDRESS_ERROR;
}

/*
* Find our scsi_id structure by looking at the status fifo address
* written to by the sbp2 device.
Expand All @@ -2138,8 +2120,7 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,
break;
}
}

if (!scsi_id) {
if (unlikely(!scsi_id)) {
SBP2_ERR("scsi_id is NULL - device is gone?");
return RCODE_ADDRESS_ERROR;
}
Expand All @@ -2156,12 +2137,14 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,
sbp2util_be32_to_cpu_buffer(sb, 8);

/*
* Handle command ORB status here if necessary. First, need to match
* status with command.
* Ignore unsolicited status. Handle command ORB status.
*/
command = sbp2util_find_command_for_orb(scsi_id, sb->ORB_offset_lo);
if (unlikely(STATUS_GET_SRC(sb->ORB_offset_hi_misc) == 2))
command = NULL;
else
command = sbp2util_find_command_for_orb(scsi_id,
sb->ORB_offset_lo);
if (command) {

SBP2_DEBUG("Found status for command ORB");
pci_dma_sync_single_for_cpu(hi->host->pdev, command->command_orb_dma,
sizeof(struct sbp2_command_orb),
Expand All @@ -2177,16 +2160,23 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,
* Matched status with command, now grab scsi command pointers
* and check status.
*/
/*
* FIXME: If the src field in the status is 1, the ORB DMA must
* not be reused until status for a subsequent ORB is received.
*/
SCpnt = command->Current_SCpnt;
spin_lock_irqsave(&scsi_id->sbp2_command_orb_lock, flags);
sbp2util_mark_command_completed(scsi_id, command);
spin_unlock_irqrestore(&scsi_id->sbp2_command_orb_lock, flags);

if (SCpnt) {
if (STATUS_TEST_RS(sb->ORB_offset_hi_misc))
scsi_status =
SBP2_SCSI_STATUS_COMMAND_TERMINATED;
/*
* See if the target stored any scsi status information.
*/
if (STATUS_GET_LENGTH(sb->ORB_offset_hi_misc) > 1) {
if (STATUS_GET_LEN(sb->ORB_offset_hi_misc) > 1) {
SBP2_DEBUG("CHECK CONDITION");
scsi_status = sbp2_status_to_sense_data(
(unchar *)sb, SCpnt->sense_buffer);
Expand All @@ -2196,7 +2186,7 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,
* Check to see if the dead bit is set. If so, we'll
* have to initiate a fetch agent reset.
*/
if (STATUS_GET_DEAD_BIT(sb->ORB_offset_hi_misc)) {
if (STATUS_TEST_D(sb->ORB_offset_hi_misc)) {
SBP2_DEBUG("Dead bit set - "
"initiating fetch agent reset");
sbp2_agent_reset(scsi_id, 0);
Expand Down
14 changes: 8 additions & 6 deletions trunk/drivers/ieee1394/sbp2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,14 @@ struct sbp2_unrestricted_page_table {

#define SBP2_SCSI_STATUS_SELECTION_TIMEOUT 0xff

#define STATUS_GET_ORB_OFFSET_HI(value) (value & 0xffff)
#define STATUS_GET_SBP_STATUS(value) ((value >> 16) & 0xff)
#define STATUS_GET_LENGTH(value) ((value >> 24) & 0x7)
#define STATUS_GET_DEAD_BIT(value) ((value >> 27) & 0x1)
#define STATUS_GET_RESP(value) ((value >> 28) & 0x3)
#define STATUS_GET_SRC(value) ((value >> 30) & 0x3)
#define STATUS_GET_SRC(value) (((value) >> 30) & 0x3)
#define STATUS_GET_LEN(value) (((value) >> 24) & 0x7)
#define STATUS_GET_ORB_OFFSET_HI(value) ((value) & 0x0000ffff)
#define STATUS_TEST_D(value) ((value) & 0x08000000)
/* test 'resp' | 'sbp2_status' */
#define STATUS_TEST_RS(value) ((value) & 0x30ff0000)
/* test 'resp' | 'dead' | 'sbp2_status' */
#define STATUS_TEST_RDS(value) ((value) & 0x38ff0000)

struct sbp2_status_block {
u32 ORB_offset_hi_misc;
Expand Down

0 comments on commit 164c0f0

Please sign in to comment.