redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[libata irq-pio] use PageHighMem() to optimize the kmap_atomic() usage 

as done in ide-scsi.c

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
hifive-unleashed-5.1
Albert Lee 2005-10-09 09:48:44 -04:00 committed by Jeff Garzik
parent 083958d313
commit 91b8b3132e
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/scsi/libata-core.c
View File

@ -2748,7 +2748,6 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
struct page *page;
unsigned int offset;
unsigned char *buf;
unsigned long flags;
if (qc->cursect == (qc->nsect - 1))
ap->hsm_task_state = HSM_ST_LAST;
@ -2762,14 +2761,21 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0);
if (PageHighMem(page)) {
unsigned long flags;
/* do the actual data transfer */
ata_data_xfer(ap, buf + offset, ATA_SECT_SIZE, do_write);
local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0);
kunmap_atomic(buf, KM_IRQ0);
local_irq_restore(flags);
/* do the actual data transfer */
ata_data_xfer(ap, buf + offset, ATA_SECT_SIZE, do_write);
kunmap_atomic(buf, KM_IRQ0);
local_irq_restore(flags);
} else {
buf = page_address(page);
ata_data_xfer(ap, buf + offset, ATA_SECT_SIZE, do_write);
}
qc->cursect++;
qc->cursg_ofs++;
@ -2908,7 +2914,6 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
struct page *page;
unsigned char *buf;
unsigned int offset, count;
unsigned long flags;
if (qc->curbytes + bytes >= qc->nbytes)
ap->hsm_task_state = HSM_ST_LAST;
@ -2954,14 +2959,21 @@ next_sg:
DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0);
if (PageHighMem(page)) {
unsigned long flags;
/* do the actual data transfer */
ata_data_xfer(ap, buf + offset, count, do_write);
local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0);
kunmap_atomic(buf, KM_IRQ0);
local_irq_restore(flags);
/* do the actual data transfer */
ata_data_xfer(ap, buf + offset, count, do_write);
kunmap_atomic(buf, KM_IRQ0);
local_irq_restore(flags);
} else {
buf = page_address(page);
ata_data_xfer(ap, buf + offset, count, do_write);
}
bytes -= count;
qc->curbytes += count;