diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2018-05-25 17:34:36 +1000 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-07-23 15:07:12 +0200 |
| commit | cf85d89562f39cc7ae73de54639f1915a9195b7a (patch) | |
| tree | 80da05c8af890fee15fb8d89775088e5d3a82964 | |
| parent | d72e90f33aa4709ebecc5005562f52335e106a60 (diff) | |
| download | lwn-cf85d89562f39cc7ae73de54639f1915a9195b7a.tar.gz lwn-cf85d89562f39cc7ae73de54639f1915a9195b7a.zip | |
m68k/mac: Enable PDMA for PowerBook 500 series
I can confirm that mac_scsi PDMA now works on these machines.
This increases sequential read throughput by a factor of 4.5.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/include/asm/macintosh.h | 1 | ||||
| -rw-r--r-- | arch/m68k/mac/config.c | 19 |
2 files changed, 1 insertions, 19 deletions
diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h index 9b840c03ebb7..08cee11180e6 100644 --- a/arch/m68k/include/asm/macintosh.h +++ b/arch/m68k/include/asm/macintosh.h @@ -57,7 +57,6 @@ struct mac_model #define MAC_SCSI_IIFX 5 #define MAC_SCSI_DUO 6 #define MAC_SCSI_LC 7 -#define MAC_SCSI_LATE 8 #define MAC_IDE_NONE 0 #define MAC_IDE_QUADRA 1 diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index e522307db47c..d468a9d467a0 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -709,7 +709,7 @@ static struct mac_model mac_data_table[] = { .name = "PowerBook 520", .adb_type = MAC_ADB_PB2, .via_type = MAC_VIA_QUADRA, - .scsi_type = MAC_SCSI_LATE, + .scsi_type = MAC_SCSI_OLD, .scc_type = MAC_SCC_QUADRA, .ether_type = MAC_ETHER_SONIC, .floppy_type = MAC_FLOPPY_SWIM_ADDR2, @@ -943,18 +943,6 @@ static const struct resource mac_scsi_old_rsrc[] __initconst = { }, }; -static const struct resource mac_scsi_late_rsrc[] __initconst = { - { - .flags = IORESOURCE_IRQ, - .start = IRQ_MAC_SCSI, - .end = IRQ_MAC_SCSI, - }, { - .flags = IORESOURCE_MEM, - .start = 0x50010000, - .end = 0x50011FFF, - }, -}; - static const struct resource mac_scsi_ccl_rsrc[] __initconst = { { .flags = IORESOURCE_IRQ, @@ -1064,11 +1052,6 @@ int __init mac_platform_init(void) platform_device_register_simple("mac_scsi", 0, mac_scsi_old_rsrc, ARRAY_SIZE(mac_scsi_old_rsrc)); break; - case MAC_SCSI_LATE: - /* XXX PDMA support for PowerBook 500 series needs testing */ - platform_device_register_simple("mac_scsi", 0, - mac_scsi_late_rsrc, ARRAY_SIZE(mac_scsi_late_rsrc)); - break; case MAC_SCSI_LC: /* Addresses from Mac LC data in Designing Cards & Drivers 3ed. * Also from the Developer Notes for Classic II, LC III, |