Commit 2677a4df authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] ide: use task_buffer[_multi]_sectors() in ide-taskfile.c

- update rq counters directly in task_buffer_sectors()
- use task_buffer[_multi]_sectors() in taskfile PIO
  handlers (CONFIG_IDE_TASKFILE_IO=n and flagged ones) so:
  (a) rq->hard_cur_sectors is used for rq mapping
  (b) in case of error valid rq->sector is reported
  (c) we can s/rq->current_nr_sectors/rq->nr_sectors/ later
- uninline task_buffer_sectors()
- remove not needed !rq->bio code from ide_[un]map_buffer()
  (it is used only for fs requests which are always bio based)
- remove no longer needed task_rq_offset()
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 89c70be6
...@@ -288,12 +288,14 @@ ide_startstop_t task_no_data_intr (ide_drive_t *drive) ...@@ -288,12 +288,14 @@ ide_startstop_t task_no_data_intr (ide_drive_t *drive)
EXPORT_SYMBOL(task_no_data_intr); EXPORT_SYMBOL(task_no_data_intr);
static inline void task_buffer_sectors(ide_drive_t *drive, struct request *rq, static void task_buffer_sectors(ide_drive_t *drive, struct request *rq,
unsigned nsect, unsigned rw) unsigned nsect, unsigned rw)
{ {
char *buf = rq->buffer + blk_rq_offset(rq); char *buf = rq->buffer + blk_rq_offset(rq);
process_that_request_first(rq, nsect); rq->sector += nsect;
rq->current_nr_sectors -= nsect;
rq->nr_sectors -= nsect;
__task_sectors(drive, buf, nsect, rw); __task_sectors(drive, buf, nsect, rw);
} }
...@@ -321,7 +323,6 @@ ide_startstop_t task_in_intr (ide_drive_t *drive) ...@@ -321,7 +323,6 @@ ide_startstop_t task_in_intr (ide_drive_t *drive)
{ {
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
char *pBuf = NULL;
u8 stat; u8 stat;
if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),DATA_READY,BAD_R_STAT)) { if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),DATA_READY,BAD_R_STAT)) {
...@@ -334,11 +335,10 @@ ide_startstop_t task_in_intr (ide_drive_t *drive) ...@@ -334,11 +335,10 @@ ide_startstop_t task_in_intr (ide_drive_t *drive)
} }
} }
pBuf = rq->buffer + task_rq_offset(rq); task_buffer_sectors(drive, rq, 1, IDE_PIO_IN);
taskfile_input_data(drive, pBuf, SECTOR_WORDS);
/* FIXME: check drive status */ /* FIXME: check drive status */
if (--rq->current_nr_sectors <= 0) if (!rq->current_nr_sectors)
if (!DRIVER(drive)->end_request(drive, 1, 0)) if (!DRIVER(drive)->end_request(drive, 1, 0))
return ide_stopped; return ide_stopped;
ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL); ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
...@@ -354,9 +354,6 @@ ide_startstop_t task_mulin_intr (ide_drive_t *drive) ...@@ -354,9 +354,6 @@ ide_startstop_t task_mulin_intr (ide_drive_t *drive)
{ {
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
char *pBuf = NULL;
unsigned int msect = drive->mult_count;
unsigned int nsect;
u8 stat; u8 stat;
if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),DATA_READY,BAD_R_STAT)) { if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),DATA_READY,BAD_R_STAT)) {
...@@ -368,21 +365,14 @@ ide_startstop_t task_mulin_intr (ide_drive_t *drive) ...@@ -368,21 +365,14 @@ ide_startstop_t task_mulin_intr (ide_drive_t *drive)
return ide_started; return ide_started;
} }
do { task_buffer_multi_sectors(drive, rq, IDE_PIO_IN);
nsect = rq->current_nr_sectors;
if (nsect > msect)
nsect = msect;
pBuf = rq->buffer + task_rq_offset(rq);
taskfile_input_data(drive, pBuf, nsect * SECTOR_WORDS);
rq->current_nr_sectors -= nsect;
msect -= nsect;
/* FIXME: check drive status */ /* FIXME: check drive status */
if (!rq->current_nr_sectors) { if (!rq->current_nr_sectors) {
if (!DRIVER(drive)->end_request(drive, 1, 0)) DRIVER(drive)->end_request(drive, 1, 0);
return ide_stopped; return ide_stopped;
} }
} while (msect);
ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL); ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL);
return ide_started; return ide_started;
} }
...@@ -405,8 +395,7 @@ ide_startstop_t pre_task_out_intr (ide_drive_t *drive, struct request *rq) ...@@ -405,8 +395,7 @@ ide_startstop_t pre_task_out_intr (ide_drive_t *drive, struct request *rq)
return startstop; return startstop;
} }
/* For Write_sectors we need to stuff the first sector */ /* For Write_sectors we need to stuff the first sector */
taskfile_output_data(drive, rq->buffer + task_rq_offset(rq), SECTOR_WORDS); task_buffer_sectors(drive, rq, 1, IDE_PIO_OUT);
rq->current_nr_sectors--;
return ide_started; return ide_started;
} }
...@@ -421,7 +410,6 @@ ide_startstop_t task_out_intr (ide_drive_t *drive) ...@@ -421,7 +410,6 @@ ide_startstop_t task_out_intr (ide_drive_t *drive)
{ {
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
char *pBuf = NULL;
u8 stat; u8 stat;
if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG), DRIVE_READY, drive->bad_wstat)) { if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG), DRIVE_READY, drive->bad_wstat)) {
...@@ -435,10 +423,7 @@ ide_startstop_t task_out_intr (ide_drive_t *drive) ...@@ -435,10 +423,7 @@ ide_startstop_t task_out_intr (ide_drive_t *drive)
if (!DRIVER(drive)->end_request(drive, 1, 0)) if (!DRIVER(drive)->end_request(drive, 1, 0))
return ide_stopped; return ide_stopped;
if ((rq->current_nr_sectors==1) ^ (stat & DRQ_STAT)) { if ((rq->current_nr_sectors==1) ^ (stat & DRQ_STAT)) {
rq = HWGROUP(drive)->rq; task_buffer_sectors(drive, rq, 1, IDE_PIO_OUT);
pBuf = rq->buffer + task_rq_offset(rq);
taskfile_output_data(drive, pBuf, SECTOR_WORDS);
rq->current_nr_sectors--;
} }
ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL); ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
return ide_started; return ide_started;
...@@ -485,9 +470,6 @@ ide_startstop_t task_mulout_intr (ide_drive_t *drive) ...@@ -485,9 +470,6 @@ ide_startstop_t task_mulout_intr (ide_drive_t *drive)
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
u8 stat = hwif->INB(IDE_STATUS_REG); u8 stat = hwif->INB(IDE_STATUS_REG);
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
char *pBuf = NULL;
unsigned int msect = drive->mult_count;
unsigned int nsect;
if (!OK_STAT(stat, DATA_READY, BAD_R_STAT) || !rq->current_nr_sectors) { if (!OK_STAT(stat, DATA_READY, BAD_R_STAT) || !rq->current_nr_sectors) {
if (stat & (ERR_STAT|DRQ_STAT)) { if (stat & (ERR_STAT|DRQ_STAT)) {
...@@ -512,15 +494,7 @@ ide_startstop_t task_mulout_intr (ide_drive_t *drive) ...@@ -512,15 +494,7 @@ ide_startstop_t task_mulout_intr (ide_drive_t *drive)
spin_unlock_irqrestore(&ide_lock, lflags); spin_unlock_irqrestore(&ide_lock, lflags);
} }
do { task_buffer_multi_sectors(drive, rq, IDE_PIO_OUT);
nsect = rq->current_nr_sectors;
if (nsect > msect)
nsect = msect;
pBuf = rq->buffer + task_rq_offset(rq);
msect -= nsect;
taskfile_output_data(drive, pBuf, nsect * SECTOR_WORDS);
rq->current_nr_sectors -= nsect;
} while (msect);
if (HWGROUP(drive)->handler == NULL) if (HWGROUP(drive)->handler == NULL)
ide_set_handler(drive, &task_mulout_intr, WAIT_WORSTCASE, NULL); ide_set_handler(drive, &task_mulout_intr, WAIT_WORSTCASE, NULL);
return ide_started; return ide_started;
...@@ -1327,7 +1301,6 @@ ide_startstop_t flagged_task_in_intr (ide_drive_t *drive) ...@@ -1327,7 +1301,6 @@ ide_startstop_t flagged_task_in_intr (ide_drive_t *drive)
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
u8 stat = hwif->INB(IDE_STATUS_REG); u8 stat = hwif->INB(IDE_STATUS_REG);
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
char *pBuf = NULL;
int retries = 5; int retries = 5;
if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) { if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) {
...@@ -1343,10 +1316,9 @@ ide_startstop_t flagged_task_in_intr (ide_drive_t *drive) ...@@ -1343,10 +1316,9 @@ ide_startstop_t flagged_task_in_intr (ide_drive_t *drive)
return DRIVER(drive)->error(drive, "flagged_task_in_intr (unexpected data phase)", stat); return DRIVER(drive)->error(drive, "flagged_task_in_intr (unexpected data phase)", stat);
} }
pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE); task_buffer_sectors(drive, rq, 1, IDE_PIO_IN);
taskfile_input_data(drive, pBuf, SECTOR_WORDS);
if (--rq->current_nr_sectors != 0) { if (rq->current_nr_sectors) {
/* /*
* (ks) We don't know which command was executed. * (ks) We don't know which command was executed.
* So, we wait the 'WORSTCASE' value. * So, we wait the 'WORSTCASE' value.
...@@ -1370,11 +1342,7 @@ ide_startstop_t flagged_task_mulin_intr (ide_drive_t *drive) ...@@ -1370,11 +1342,7 @@ ide_startstop_t flagged_task_mulin_intr (ide_drive_t *drive)
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
u8 stat = hwif->INB(IDE_STATUS_REG); u8 stat = hwif->INB(IDE_STATUS_REG);
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
char *pBuf = NULL;
int retries = 5; int retries = 5;
unsigned int msect, nsect;
msect = drive->mult_count;
if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) { if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) {
if (stat & ERR_STAT) { if (stat & ERR_STAT) {
...@@ -1389,11 +1357,8 @@ ide_startstop_t flagged_task_mulin_intr (ide_drive_t *drive) ...@@ -1389,11 +1357,8 @@ ide_startstop_t flagged_task_mulin_intr (ide_drive_t *drive)
return DRIVER(drive)->error(drive, "flagged_task_mulin_intr (unexpected data phase)", stat); return DRIVER(drive)->error(drive, "flagged_task_mulin_intr (unexpected data phase)", stat);
} }
nsect = (rq->current_nr_sectors > msect) ? msect : rq->current_nr_sectors; task_buffer_multi_sectors(drive, rq, IDE_PIO_IN);
pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE);
taskfile_input_data(drive, pBuf, nsect * SECTOR_WORDS);
rq->current_nr_sectors -= nsect;
if (rq->current_nr_sectors != 0) { if (rq->current_nr_sectors != 0) {
/* /*
* (ks) We don't know which command was executed. * (ks) We don't know which command was executed.
...@@ -1427,8 +1392,7 @@ ide_startstop_t flagged_pre_task_out_intr (ide_drive_t *drive, struct request *r ...@@ -1427,8 +1392,7 @@ ide_startstop_t flagged_pre_task_out_intr (ide_drive_t *drive, struct request *r
return startstop; return startstop;
} }
taskfile_output_data(drive, rq->buffer, SECTOR_WORDS); task_buffer_sectors(drive, rq, 1, IDE_PIO_OUT);
--rq->current_nr_sectors;
return ide_started; return ide_started;
} }
...@@ -1438,7 +1402,6 @@ ide_startstop_t flagged_task_out_intr (ide_drive_t *drive) ...@@ -1438,7 +1402,6 @@ ide_startstop_t flagged_task_out_intr (ide_drive_t *drive)
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
u8 stat = hwif->INB(IDE_STATUS_REG); u8 stat = hwif->INB(IDE_STATUS_REG);
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
char *pBuf = NULL;
if (!OK_STAT(stat, DRIVE_READY, BAD_W_STAT)) if (!OK_STAT(stat, DRIVE_READY, BAD_W_STAT))
return DRIVER(drive)->error(drive, "flagged_task_out_intr", stat); return DRIVER(drive)->error(drive, "flagged_task_out_intr", stat);
...@@ -1458,9 +1421,7 @@ ide_startstop_t flagged_task_out_intr (ide_drive_t *drive) ...@@ -1458,9 +1421,7 @@ ide_startstop_t flagged_task_out_intr (ide_drive_t *drive)
return DRIVER(drive)->error(drive, "flagged_task_out_intr (unexpected data phase)", stat); return DRIVER(drive)->error(drive, "flagged_task_out_intr (unexpected data phase)", stat);
} }
pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE); task_buffer_sectors(drive, rq, 1, IDE_PIO_OUT);
taskfile_output_data(drive, pBuf, SECTOR_WORDS);
--rq->current_nr_sectors;
/* /*
* (ks) We don't know which command was executed. * (ks) We don't know which command was executed.
...@@ -1473,11 +1434,7 @@ ide_startstop_t flagged_task_out_intr (ide_drive_t *drive) ...@@ -1473,11 +1434,7 @@ ide_startstop_t flagged_task_out_intr (ide_drive_t *drive)
ide_startstop_t flagged_pre_task_mulout_intr (ide_drive_t *drive, struct request *rq) ide_startstop_t flagged_pre_task_mulout_intr (ide_drive_t *drive, struct request *rq)
{ {
char *pBuf = NULL;
ide_startstop_t startstop; ide_startstop_t startstop;
unsigned int msect, nsect;
msect = drive->mult_count;
if (ide_wait_stat(&startstop, drive, DATA_READY, if (ide_wait_stat(&startstop, drive, DATA_READY,
BAD_W_STAT, WAIT_DRQ)) { BAD_W_STAT, WAIT_DRQ)) {
...@@ -1485,11 +1442,7 @@ ide_startstop_t flagged_pre_task_mulout_intr (ide_drive_t *drive, struct request ...@@ -1485,11 +1442,7 @@ ide_startstop_t flagged_pre_task_mulout_intr (ide_drive_t *drive, struct request
return startstop; return startstop;
} }
nsect = (rq->current_nr_sectors > msect) ? msect : rq->current_nr_sectors; task_buffer_multi_sectors(drive, rq, IDE_PIO_OUT);
pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE);
taskfile_output_data(drive, pBuf, nsect * SECTOR_WORDS);
rq->current_nr_sectors -= nsect;
return ide_started; return ide_started;
} }
...@@ -1499,10 +1452,6 @@ ide_startstop_t flagged_task_mulout_intr (ide_drive_t *drive) ...@@ -1499,10 +1452,6 @@ ide_startstop_t flagged_task_mulout_intr (ide_drive_t *drive)
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
u8 stat = hwif->INB(IDE_STATUS_REG); u8 stat = hwif->INB(IDE_STATUS_REG);
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
char *pBuf = NULL;
unsigned int msect, nsect;
msect = drive->mult_count;
if (!OK_STAT(stat, DRIVE_READY, BAD_W_STAT)) if (!OK_STAT(stat, DRIVE_READY, BAD_W_STAT))
return DRIVER(drive)->error(drive, "flagged_task_mulout_intr", stat); return DRIVER(drive)->error(drive, "flagged_task_mulout_intr", stat);
...@@ -1522,10 +1471,7 @@ ide_startstop_t flagged_task_mulout_intr (ide_drive_t *drive) ...@@ -1522,10 +1471,7 @@ ide_startstop_t flagged_task_mulout_intr (ide_drive_t *drive)
return DRIVER(drive)->error(drive, "flagged_task_mulout_intr (unexpected data phase)", stat); return DRIVER(drive)->error(drive, "flagged_task_mulout_intr (unexpected data phase)", stat);
} }
nsect = (rq->current_nr_sectors > msect) ? msect : rq->current_nr_sectors; task_buffer_multi_sectors(drive, rq, IDE_PIO_OUT);
pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE);
taskfile_output_data(drive, pBuf, nsect * SECTOR_WORDS);
rq->current_nr_sectors -= nsect;
/* /*
* (ks) We don't know which command was executed. * (ks) We don't know which command was executed.
......
...@@ -833,29 +833,13 @@ typedef struct ide_dma_ops_s { ...@@ -833,29 +833,13 @@ typedef struct ide_dma_ops_s {
#define ide_rq_offset(rq) \ #define ide_rq_offset(rq) \
(((rq)->hard_cur_sectors - (rq)->current_nr_sectors) << 9) (((rq)->hard_cur_sectors - (rq)->current_nr_sectors) << 9)
/*
* taskfiles really should use hard_cur_sectors as well!
*/
#define task_rq_offset(rq) \
(((rq)->nr_sectors - (rq)->current_nr_sectors) * SECTOR_SIZE)
static inline void *ide_map_buffer(struct request *rq, unsigned long *flags) static inline void *ide_map_buffer(struct request *rq, unsigned long *flags)
{ {
/*
* fs request
*/
if (rq->bio)
return bio_kmap_irq(rq->bio, flags) + ide_rq_offset(rq); return bio_kmap_irq(rq->bio, flags) + ide_rq_offset(rq);
/*
* task request
*/
return rq->buffer + task_rq_offset(rq);
} }
static inline void ide_unmap_buffer(struct request *rq, char *buffer, unsigned long *flags) static inline void ide_unmap_buffer(struct request *rq, char *buffer, unsigned long *flags)
{ {
if (rq->bio)
bio_kunmap_irq(buffer, flags); bio_kunmap_irq(buffer, flags);
} }
#endif /* !CONFIG_IDE_TASKFILE_IO */ #endif /* !CONFIG_IDE_TASKFILE_IO */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment