adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

mg_disk: Add missing ready status check on mg_write()

Browse source 
When last sector is written, ready bit of status register should be
checked.

Signed-off-by: unsik Kim <donari75@gmail.com>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
unsik Kim 2009-07-28 08:57:33 +02:00 committed by Jens Axboe
parent 394c6cc63c
commit a85a00a699
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/block/mg_disk.c
View file

@ -524,16 +524,16 @@ static void mg_write_one(struct mg_host *host, struct request *req)
static void mg_write(struct request *req) static void mg_write(struct request *req)
{ {
struct mg_host *host = req->rq_disk->private_data; struct mg_host *host = req->rq_disk->private_data;
bool rem; unsigned int rem = blk_rq_sectors(req);
if (mg_out(host, blk_rq_pos(req), blk_rq_sectors(req), if (mg_out(host, blk_rq_pos(req), rem,
MG_CMD_WR, NULL) != MG_ERR_NONE) { MG_CMD_WR, NULL) != MG_ERR_NONE) {
mg_bad_rw_intr(host); mg_bad_rw_intr(host);
return; return;
} }
MG_DBG("requested %d sects (from %ld), buffer=0x%p\n", MG_DBG("requested %d sects (from %ld), buffer=0x%p\n",
blk_rq_sectors(req), blk_rq_pos(req), req->buffer); rem, blk_rq_pos(req), req->buffer);
if (mg_wait(host, ATA_DRQ, if (mg_wait(host, ATA_DRQ,
MG_TMAX_WAIT_WR_DRQ) != MG_ERR_NONE) { MG_TMAX_WAIT_WR_DRQ) != MG_ERR_NONE) {
@ -541,25 +541,23 @@ static void mg_write(struct request *req)
return; return;
} }
mg_write_one(host, req);
outb(MG_CMD_WR_CONF, (unsigned long)host->dev_base + MG_REG_COMMAND);
do { do {
if (blk_rq_sectors(req) > 1 && mg_write_one(host, req);
mg_wait(host, ATA_DRQ,
MG_TMAX_WAIT_WR_DRQ) != MG_ERR_NONE) { outb(MG_CMD_WR_CONF, (unsigned long)host->dev_base +
MG_REG_COMMAND);
rem--;
if (rem > 1 && mg_wait(host, ATA_DRQ,
MG_TMAX_WAIT_WR_DRQ) != MG_ERR_NONE) {
mg_bad_rw_intr(host);
return;
} else if (mg_wait(host, MG_STAT_READY,
MG_TMAX_WAIT_WR_DRQ) != MG_ERR_NONE) {
mg_bad_rw_intr(host); mg_bad_rw_intr(host);
return; return;
} }
} while (mg_end_request(host, 0, MG_SECTOR_SIZE));
rem = mg_end_request(host, 0, MG_SECTOR_SIZE);
if (rem)
mg_write_one(host, req);
outb(MG_CMD_WR_CONF,
(unsigned long)host->dev_base + MG_REG_COMMAND);
} while (rem);
} }
static void mg_read_intr(struct mg_host *host) static void mg_read_intr(struct mg_host *host)