Skip to content

L
linux
Commit 58a4a11f authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] clean up ide floppy

parent 0acf82e5
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 65 deletions
drivers/ide/ide-floppy.c
View file @ 58a4a11f
...@@ -115,6 +115,12 @@ ...@@ -115,6 +115,12 @@
/* #define IDEFLOPPY_DEBUG(fmt, args...) printk(KERN_INFO fmt, ## args) */ /* #define IDEFLOPPY_DEBUG(fmt, args...) printk(KERN_INFO fmt, ## args) */
#define IDEFLOPPY_DEBUG( fmt, args... ) #define IDEFLOPPY_DEBUG( fmt, args... )
#ifndef IDEFLOPPY_DEBUG_LOG
#define debug_log(fmt, args... ) do {} while(0)
#else
#define debug_log printk
#endif
/* /*
* Some drives require a longer irq timeout. * Some drives require a longer irq timeout.
...@@ -543,9 +549,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs) ...@@ -543,9 +549,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs)
struct request *rq = HWGROUP(drive)->rq; struct request *rq = HWGROUP(drive)->rq;
int error; int error;
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "Reached idefloppy_end_request\n");
printk(KERN_INFO "Reached idefloppy_end_request\n");
#endif /* IDEFLOPPY_DEBUG_LOG */
switch (uptodate) { switch (uptodate) {
case 0: error = IDEFLOPPY_ERROR_GENERAL; break; case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
...@@ -627,7 +631,6 @@ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, un ...@@ -627,7 +631,6 @@ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, un
} }
} }
#ifdef CONFIG_BLK_DEV_IDEDMA
static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc) static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc)
{ {
struct request *rq = pc->rq; struct request *rq = pc->rq;
...@@ -636,7 +639,6 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc) ...@@ -636,7 +639,6 @@ static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc)
while ((bio = rq->bio) != NULL) while ((bio = rq->bio) != NULL)
idefloppy_do_end_request(drive, 1, 0); idefloppy_do_end_request(drive, 1, 0);
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
/* /*
* idefloppy_queue_pc_head generates a new packet command request in front * idefloppy_queue_pc_head generates a new packet command request in front
...@@ -682,25 +684,22 @@ static void idefloppy_analyze_error (ide_drive_t *drive,idefloppy_request_sense_ ...@@ -682,25 +684,22 @@ static void idefloppy_analyze_error (ide_drive_t *drive,idefloppy_request_sense_
floppy->ascq = result->ascq; floppy->ascq = result->ascq;
floppy->progress_indication = result->sksv[0] & 0x80 ? floppy->progress_indication = result->sksv[0] & 0x80 ?
(u16)get_unaligned((u16 *)(result->sksv+1)):0x10000; (u16)get_unaligned((u16 *)(result->sksv+1)):0x10000;
#if IDEFLOPPY_DEBUG_LOG
if (floppy->failed_pc) if (floppy->failed_pc)
printk(KERN_INFO "ide-floppy: pc = %x, sense key = %x, " debug_log(KERN_INFO "ide-floppy: pc = %x, sense key = %x, "
"asc = %x, ascq = %x\n", floppy->failed_pc->c[0], "asc = %x, ascq = %x\n", floppy->failed_pc->c[0],
result->sense_key, result->asc, result->ascq); result->sense_key, result->asc, result->ascq);
else else
printk(KERN_INFO "ide-floppy: sense key = %x, asc = %x, " debug_log(KERN_INFO "ide-floppy: sense key = %x, asc = %x, "
"ascq = %x\n", result->sense_key, "ascq = %x\n", result->sense_key,
result->asc, result->ascq); result->asc, result->ascq);
#endif /* IDEFLOPPY_DEBUG_LOG */
} }
static void idefloppy_request_sense_callback (ide_drive_t *drive) static void idefloppy_request_sense_callback (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
printk(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
#endif /* IDEFLOPPY_DEBUG_LOG */
if (!floppy->pc->error) { if (!floppy->pc->error) {
idefloppy_analyze_error(drive,(idefloppy_request_sense_result_t *) floppy->pc->buffer); idefloppy_analyze_error(drive,(idefloppy_request_sense_result_t *) floppy->pc->buffer);
idefloppy_do_end_request(drive, 1, 0); idefloppy_do_end_request(drive, 1, 0);
...@@ -717,9 +716,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive) ...@@ -717,9 +716,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive)
{ {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
printk (KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
#endif /* IDEFLOPPY_DEBUG_LOG */
idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0); idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0);
} }
...@@ -781,12 +778,9 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) ...@@ -781,12 +778,9 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
struct request *rq = pc->rq; struct request *rq = pc->rq;
unsigned int temp; unsigned int temp;
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "ide-floppy: Reached %s interrupt handler\n",
printk(KERN_INFO "ide-floppy: Reached %s interrupt handler\n",
__FUNCTION__); __FUNCTION__);
#endif /* IDEFLOPPY_DEBUG_LOG */
#ifdef CONFIG_BLK_DEV_IDEDMA
if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) {
if (HWIF(drive)->ide_dma_end(drive)) { if (HWIF(drive)->ide_dma_end(drive)) {
set_bit(PC_DMA_ERROR, &pc->flags); set_bit(PC_DMA_ERROR, &pc->flags);
...@@ -794,30 +788,23 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) ...@@ -794,30 +788,23 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
pc->actually_transferred = pc->request_transfer; pc->actually_transferred = pc->request_transfer;
idefloppy_update_buffers(drive, pc); idefloppy_update_buffers(drive, pc);
} }
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "ide-floppy: DMA finished\n");
printk (KERN_INFO "ide-floppy: DMA finished\n");
#endif /* IDEFLOPPY_DEBUG_LOG */
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
/* Clear the interrupt */ /* Clear the interrupt */
status.all = HWIF(drive)->INB(IDE_STATUS_REG); status.all = HWIF(drive)->INB(IDE_STATUS_REG);
if (!status.b.drq) { /* No more interrupts */ if (!status.b.drq) { /* No more interrupts */
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "Packet command completed, %d bytes "
printk(KERN_INFO "Packet command completed, %d bytes "
"transferred\n", pc->actually_transferred); "transferred\n", pc->actually_transferred);
#endif /* IDEFLOPPY_DEBUG_LOG */
clear_bit(PC_DMA_IN_PROGRESS, &pc->flags); clear_bit(PC_DMA_IN_PROGRESS, &pc->flags);
local_irq_enable(); local_irq_enable();
if (status.b.check || test_bit(PC_DMA_ERROR, &pc->flags)) { if (status.b.check || test_bit(PC_DMA_ERROR, &pc->flags)) {
/* Error detected */ /* Error detected */
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "ide-floppy: %s: I/O error\n",
printk(KERN_INFO "ide-floppy: %s: I/O error\n",
drive->name); drive->name);
#endif /* IDEFLOPPY_DEBUG_LOG */
rq->errors++; rq->errors++;
if (pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) { if (pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) {
printk(KERN_ERR "ide-floppy: I/O error in " printk(KERN_ERR "ide-floppy: I/O error in "
...@@ -836,14 +823,14 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) ...@@ -836,14 +823,14 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
pc->callback(drive); pc->callback(drive);
return ide_stopped; return ide_stopped;
} }
#ifdef CONFIG_BLK_DEV_IDEDMA
if (test_and_clear_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { if (test_and_clear_bit(PC_DMA_IN_PROGRESS, &pc->flags)) {
printk(KERN_ERR "ide-floppy: The floppy wants to issue " printk(KERN_ERR "ide-floppy: The floppy wants to issue "
"more interrupts in DMA mode\n"); "more interrupts in DMA mode\n");
(void) HWIF(drive)->ide_dma_off(drive); (void) HWIF(drive)->ide_dma_off(drive);
return ide_do_reset(drive); return ide_do_reset(drive);
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
/* Get the number of bytes to transfer */ /* Get the number of bytes to transfer */
bcount.b.high = HWIF(drive)->INB(IDE_BCOUNTH_REG); bcount.b.high = HWIF(drive)->INB(IDE_BCOUNTH_REG);
bcount.b.low = HWIF(drive)->INB(IDE_BCOUNTL_REG); bcount.b.low = HWIF(drive)->INB(IDE_BCOUNTL_REG);
...@@ -879,11 +866,9 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) ...@@ -879,11 +866,9 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
NULL); NULL);
return ide_started; return ide_started;
} }
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_NOTICE "ide-floppy: The floppy wants to "
printk(KERN_NOTICE "ide-floppy: The floppy wants to "
"send us more data than expected - " "send us more data than expected - "
"allowing transfer\n"); "allowing transfer\n");
#endif /* IDEFLOPPY_DEBUG_LOG */
} }
} }
if (test_bit(PC_WRITING, &pc->flags)) { if (test_bit(PC_WRITING, &pc->flags)) {
...@@ -1047,9 +1032,8 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p ...@@ -1047,9 +1032,8 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
pc->callback(drive); pc->callback(drive);
return ide_stopped; return ide_stopped;
} }
#if IDEFLOPPY_DEBUG_LOG
printk(KERN_INFO "Retry number - %d\n",pc->retries); debug_log(KERN_INFO "Retry number - %d\n",pc->retries);
#endif /* IDEFLOPPY_DEBUG_LOG */
pc->retries++; pc->retries++;
/* We haven't transferred any data yet */ /* We haven't transferred any data yet */
...@@ -1057,13 +1041,11 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p ...@@ -1057,13 +1041,11 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
pc->current_position = pc->buffer; pc->current_position = pc->buffer;
bcount.all = min(pc->request_transfer, 63 * 1024); bcount.all = min(pc->request_transfer, 63 * 1024);
#ifdef CONFIG_BLK_DEV_IDEDMA
if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) { if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) {
(void) HWIF(drive)->ide_dma_off(drive); (void) HWIF(drive)->ide_dma_off(drive);
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
feature.all = 0; feature.all = 0;
#ifdef CONFIG_BLK_DEV_IDEDMA
if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) { if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) {
if (test_bit(PC_WRITING, &pc->flags)) { if (test_bit(PC_WRITING, &pc->flags)) {
feature.b.dma = !HWIF(drive)->ide_dma_write(drive); feature.b.dma = !HWIF(drive)->ide_dma_write(drive);
...@@ -1071,7 +1053,6 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p ...@@ -1071,7 +1053,6 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
feature.b.dma = !HWIF(drive)->ide_dma_read(drive); feature.b.dma = !HWIF(drive)->ide_dma_read(drive);
} }
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
if (IDE_CONTROL_REG) if (IDE_CONTROL_REG)
HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG); HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
...@@ -1081,12 +1062,10 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p ...@@ -1081,12 +1062,10 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
HWIF(drive)->OUTB(bcount.b.low, IDE_BCOUNTL_REG); HWIF(drive)->OUTB(bcount.b.low, IDE_BCOUNTL_REG);
HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG); HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG);
#ifdef CONFIG_BLK_DEV_IDEDMA
if (feature.b.dma) { /* Begin DMA, if necessary */ if (feature.b.dma) { /* Begin DMA, if necessary */
set_bit(PC_DMA_IN_PROGRESS, &pc->flags); set_bit(PC_DMA_IN_PROGRESS, &pc->flags);
(void) (HWIF(drive)->ide_dma_begin(drive)); (void) (HWIF(drive)->ide_dma_begin(drive));
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
/* Can we transfer the packet when we get the interrupt or wait? */ /* Can we transfer the packet when we get the interrupt or wait? */
if (test_bit(IDEFLOPPY_ZIP_DRIVE, &floppy->flags)) { if (test_bit(IDEFLOPPY_ZIP_DRIVE, &floppy->flags)) {
...@@ -1116,9 +1095,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p ...@@ -1116,9 +1095,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
static void idefloppy_rw_callback (ide_drive_t *drive) static void idefloppy_rw_callback (ide_drive_t *drive)
{ {
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "ide-floppy: Reached idefloppy_rw_callback\n");
printk (KERN_INFO "ide-floppy: Reached idefloppy_rw_callback\n");
#endif /* IDEFLOPPY_DEBUG_LOG */
idefloppy_do_end_request(drive, 1, 0); idefloppy_do_end_request(drive, 1, 0);
return; return;
...@@ -1126,10 +1103,8 @@ static void idefloppy_rw_callback (ide_drive_t *drive) ...@@ -1126,10 +1103,8 @@ static void idefloppy_rw_callback (ide_drive_t *drive)
static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent) static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent)
{ {
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "ide-floppy: creating prevent removal command, "
printk(KERN_INFO "ide-floppy: creating prevent removal command, "
"prevent = %d\n", prevent); "prevent = %d\n", prevent);
#endif /* IDEFLOPPY_DEBUG_LOG */
idefloppy_init_pc(pc); idefloppy_init_pc(pc);
pc->c[0] = IDEFLOPPY_PREVENT_REMOVAL_CMD; pc->c[0] = IDEFLOPPY_PREVENT_REMOVAL_CMD;
...@@ -1212,11 +1187,9 @@ static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t ...@@ -1212,11 +1187,9 @@ static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t
int blocks = rq->nr_sectors / floppy->bs_factor; int blocks = rq->nr_sectors / floppy->bs_factor;
int cmd = rq_data_dir(rq); int cmd = rq_data_dir(rq);
#if IDEFLOPPY_DEBUG_LOG debug_log("create_rw1%d_cmd: block == %d, blocks == %d\n",
printk("create_rw1%d_cmd: block == %d, blocks == %d\n",
2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags), 2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags),
block, blocks); block, blocks);
#endif /* IDEFLOPPY_DEBUG_LOG */
idefloppy_init_pc(pc); idefloppy_init_pc(pc);
if (test_bit(IDEFLOPPY_USE_READ12, &floppy->flags)) { if (test_bit(IDEFLOPPY_USE_READ12, &floppy->flags)) {
...@@ -1262,14 +1235,12 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request ...@@ -1262,14 +1235,12 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
idefloppy_pc_t *pc; idefloppy_pc_t *pc;
unsigned long block = (unsigned long)block_s; unsigned long block = (unsigned long)block_s;
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "rq_status: %d, dev: %s, flags: %lx, errors: %d\n",
printk(KERN_INFO "rq_status: %d, dev: %s, flags: %lx, errors: %d\n",
rq->rq_status, rq->rq_disk->disk_name, rq->rq_status, rq->rq_disk->disk_name,
rq->flags, rq->errors); rq->flags, rq->errors);
printk(KERN_INFO "sector: %ld, nr_sectors: %ld, " debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, "
"current_nr_sectors: %ld\n", (long)rq->sector, "current_nr_sectors: %d\n", (long)rq->sector,
rq->nr_sectors, rq->current_nr_sectors); rq->nr_sectors, rq->current_nr_sectors);
#endif /* IDEFLOPPY_DEBUG_LOG */
if (rq->errors >= ERROR_MAX) { if (rq->errors >= ERROR_MAX) {
if (floppy->failed_pc != NULL) if (floppy->failed_pc != NULL)
...@@ -1473,10 +1444,10 @@ static int idefloppy_get_capacity (ide_drive_t *drive) ...@@ -1473,10 +1444,10 @@ static int idefloppy_get_capacity (ide_drive_t *drive)
} }
} }
if (!i) { if (!i) {
IDEFLOPPY_DEBUG( "Descriptor 0 Code: %d\n", debug_log( "Descriptor 0 Code: %d\n",
descriptor->dc); descriptor->dc);
} }
IDEFLOPPY_DEBUG( "Descriptor %d: %dkB, %d blocks, %d " debug_log( "Descriptor %d: %dkB, %d blocks, %d "
"sector size\n", i, blocks * length / 1024, blocks, "sector size\n", i, blocks * length / 1024, blocks,
length); length);
} }
...@@ -1909,9 +1880,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp) ...@@ -1909,9 +1880,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
drive->usage++; drive->usage++;
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "Reached idefloppy_open\n");
printk(KERN_INFO "Reached idefloppy_open\n");
#endif /* IDEFLOPPY_DEBUG_LOG */
if (drive->usage == 1) { if (drive->usage == 1) {
clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags); clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
...@@ -1958,9 +1927,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp) ...@@ -1958,9 +1927,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
idefloppy_pc_t pc; idefloppy_pc_t pc;
#if IDEFLOPPY_DEBUG_LOG debug_log(KERN_INFO "Reached idefloppy_release\n");
printk (KERN_INFO "Reached idefloppy_release\n");
#endif /* IDEFLOPPY_DEBUG_LOG */
if (drive->usage == 1) { if (drive->usage == 1) {
idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_floppy_t *floppy = drive->driver_data;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7