Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit bfe172310e58225f0d07f9354b683abacbd6a0d8

Authored by FUJITA Tomonori
Committed by Jens Axboe
1 parent b375a612ad
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

block: kill ISA_DMA_THRESHOLD usage 

block uses ISA_DMA_THRESHOLD for BLK_BOUNCE_ISA. Only SCSI uses
ISA_DMA_THRESHOLD for ancient drivers with non-zero
unchecked_isa_dma. Nowadays drivers (and subsystems) use dma_mask
properly instead of ISA_DMA_THRESHOLD.

Documentation/scsi/scsi_mid_low_api.txt says:

unchecked_isa_dma - 1=>only use bottom 16 MB of ram (ISA DMA addressing
                   restriction), 0=>can use full 32 bit (or better) DMA
                   address space

So block simply uses DMA_BIT_MASK(24) for BLK_BOUNCE_ISA for SCSI.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

include/linux/blkdev.h
Diff comments   View file @ bfe1723
... ... @@ -712,7 +712,7 @@
712 712 #define BLK_BOUNCE_HIGH -1ULL
713 713 #endif
714 714 #define BLK_BOUNCE_ANY (-1ULL)
715   -#define BLK_BOUNCE_ISA (ISA_DMA_THRESHOLD)
  715 +#define BLK_BOUNCE_ISA (DMA_BIT_MASK(24))
716 716  
717 717 /*
718 718 * default timeout for SG_IO if none specified