Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 77615
b: refs/heads/master
c: a9c73d0
h: refs/heads/master
i:
  77613: 0bc4fdd
  77611: 5521881
  77607: 58fbad8
  77599: 31ea0d4
v: v3
  • Loading branch information
Kiyoshi Ueda authored and Jens Axboe committed Jan 28, 2008
1 parent 4fa97ef commit 54cf5e3
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 31 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: 5047c3c64eb4787b9a2d80a2003d9edded41f560
refs/heads/master: a9c73d05f16113744e3d342255120bd36d84a1e8
58 changes: 28 additions & 30 deletions trunk/drivers/block/sx8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,16 +744,14 @@ static unsigned int carm_fill_get_fw_ver(struct carm_host *host,

static inline void carm_end_request_queued(struct carm_host *host,
struct carm_request *crq,
int uptodate)
int error)
{
struct request *req = crq->rq;
int rc;

rc = end_that_request_first(req, uptodate, req->hard_nr_sectors);
rc = __blk_end_request(req, error, blk_rq_bytes(req));
assert(rc == 0);

end_that_request_last(req, uptodate);

rc = carm_put_request(host, crq);
assert(rc == 0);
}
Expand Down Expand Up @@ -793,9 +791,9 @@ static inline void carm_round_robin(struct carm_host *host)
}

static inline void carm_end_rq(struct carm_host *host, struct carm_request *crq,
int is_ok)
int error)
{
carm_end_request_queued(host, crq, is_ok);
carm_end_request_queued(host, crq, error);
if (max_queue == 1)
carm_round_robin(host);
else if ((host->n_msgs <= CARM_MSG_LOW_WATER) &&
Expand Down Expand Up @@ -873,14 +871,14 @@ static void carm_rq_fn(struct request_queue *q)
sg = &crq->sg[0];
n_elem = blk_rq_map_sg(q, rq, sg);
if (n_elem <= 0) {
carm_end_rq(host, crq, 0);
carm_end_rq(host, crq, -EIO);
return; /* request with no s/g entries? */
}

/* map scatterlist to PCI bus addresses */
n_elem = pci_map_sg(host->pdev, sg, n_elem, pci_dir);
if (n_elem <= 0) {
carm_end_rq(host, crq, 0);
carm_end_rq(host, crq, -EIO);
return; /* request with no s/g entries? */
}
crq->n_elem = n_elem;
Expand Down Expand Up @@ -941,7 +939,7 @@ static void carm_rq_fn(struct request_queue *q)

static void carm_handle_array_info(struct carm_host *host,
struct carm_request *crq, u8 *mem,
int is_ok)
int error)
{
struct carm_port *port;
u8 *msg_data = mem + sizeof(struct carm_array_info);
Expand All @@ -952,9 +950,9 @@ static void carm_handle_array_info(struct carm_host *host,

DPRINTK("ENTER\n");

carm_end_rq(host, crq, is_ok);
carm_end_rq(host, crq, error);

if (!is_ok)
if (error)
goto out;
if (le32_to_cpu(desc->array_status) & ARRAY_NO_EXIST)
goto out;
Expand Down Expand Up @@ -1001,17 +999,17 @@ static void carm_handle_array_info(struct carm_host *host,

static void carm_handle_scan_chan(struct carm_host *host,
struct carm_request *crq, u8 *mem,
int is_ok)
int error)
{
u8 *msg_data = mem + IOC_SCAN_CHAN_OFFSET;
unsigned int i, dev_count = 0;
int new_state = HST_DEV_SCAN_START;

DPRINTK("ENTER\n");

carm_end_rq(host, crq, is_ok);
carm_end_rq(host, crq, error);

if (!is_ok) {
if (error) {
new_state = HST_ERROR;
goto out;
}
Expand All @@ -1033,23 +1031,23 @@ static void carm_handle_scan_chan(struct carm_host *host,
}

static void carm_handle_generic(struct carm_host *host,
struct carm_request *crq, int is_ok,
struct carm_request *crq, int error,
int cur_state, int next_state)
{
DPRINTK("ENTER\n");

carm_end_rq(host, crq, is_ok);
carm_end_rq(host, crq, error);

assert(host->state == cur_state);
if (is_ok)
host->state = next_state;
else
if (error)
host->state = HST_ERROR;
else
host->state = next_state;
schedule_work(&host->fsm_task);
}

static inline void carm_handle_rw(struct carm_host *host,
struct carm_request *crq, int is_ok)
struct carm_request *crq, int error)
{
int pci_dir;

Expand All @@ -1062,7 +1060,7 @@ static inline void carm_handle_rw(struct carm_host *host,

pci_unmap_sg(host->pdev, &crq->sg[0], crq->n_elem, pci_dir);

carm_end_rq(host, crq, is_ok);
carm_end_rq(host, crq, error);
}

static inline void carm_handle_resp(struct carm_host *host,
Expand All @@ -1071,7 +1069,7 @@ static inline void carm_handle_resp(struct carm_host *host,
u32 handle = le32_to_cpu(ret_handle_le);
unsigned int msg_idx;
struct carm_request *crq;
int is_ok = (status == RMSG_OK);
int error = (status == RMSG_OK) ? 0 : -EIO;
u8 *mem;

VPRINTK("ENTER, handle == 0x%x\n", handle);
Expand All @@ -1090,7 +1088,7 @@ static inline void carm_handle_resp(struct carm_host *host,
/* fast path */
if (likely(crq->msg_type == CARM_MSG_READ ||
crq->msg_type == CARM_MSG_WRITE)) {
carm_handle_rw(host, crq, is_ok);
carm_handle_rw(host, crq, error);
return;
}

Expand All @@ -1100,7 +1098,7 @@ static inline void carm_handle_resp(struct carm_host *host,
case CARM_MSG_IOCTL: {
switch (crq->msg_subtype) {
case CARM_IOC_SCAN_CHAN:
carm_handle_scan_chan(host, crq, mem, is_ok);
carm_handle_scan_chan(host, crq, mem, error);
break;
default:
/* unknown / invalid response */
Expand All @@ -1112,21 +1110,21 @@ static inline void carm_handle_resp(struct carm_host *host,
case CARM_MSG_MISC: {
switch (crq->msg_subtype) {
case MISC_ALLOC_MEM:
carm_handle_generic(host, crq, is_ok,
carm_handle_generic(host, crq, error,
HST_ALLOC_BUF, HST_SYNC_TIME);
break;
case MISC_SET_TIME:
carm_handle_generic(host, crq, is_ok,
carm_handle_generic(host, crq, error,
HST_SYNC_TIME, HST_GET_FW_VER);
break;
case MISC_GET_FW_VER: {
struct carm_fw_ver *ver = (struct carm_fw_ver *)
mem + sizeof(struct carm_msg_get_fw_ver);
if (is_ok) {
if (!error) {
host->fw_ver = le32_to_cpu(ver->version);
host->flags |= (ver->features & FL_FW_VER_MASK);
}
carm_handle_generic(host, crq, is_ok,
carm_handle_generic(host, crq, error,
HST_GET_FW_VER, HST_PORT_SCAN);
break;
}
Expand All @@ -1140,7 +1138,7 @@ static inline void carm_handle_resp(struct carm_host *host,
case CARM_MSG_ARRAY: {
switch (crq->msg_subtype) {
case CARM_ARRAY_INFO:
carm_handle_array_info(host, crq, mem, is_ok);
carm_handle_array_info(host, crq, mem, error);
break;
default:
/* unknown / invalid response */
Expand All @@ -1159,7 +1157,7 @@ static inline void carm_handle_resp(struct carm_host *host,
err_out:
printk(KERN_WARNING DRV_NAME "(%s): BUG: unhandled message type %d/%d\n",
pci_name(host->pdev), crq->msg_type, crq->msg_subtype);
carm_end_rq(host, crq, 0);
carm_end_rq(host, crq, -EIO);
}

static inline void carm_handle_responses(struct carm_host *host)
Expand Down

0 comments on commit 54cf5e3

Please sign in to comment.