Эх сурвалжийг харах

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>
Finn Thain 7 жил өмнө
parent
commit
cf85d89562

+ 0 - 1
arch/m68k/include/asm/macintosh.h

@@ -57,7 +57,6 @@ struct mac_model
 #define MAC_SCSI_IIFX		5
 #define MAC_SCSI_IIFX		5
 #define MAC_SCSI_DUO		6
 #define MAC_SCSI_DUO		6
 #define MAC_SCSI_LC		7
 #define MAC_SCSI_LC		7
-#define MAC_SCSI_LATE		8
 
 
 #define MAC_IDE_NONE		0
 #define MAC_IDE_NONE		0
 #define MAC_IDE_QUADRA		1
 #define MAC_IDE_QUADRA		1

+ 1 - 18
arch/m68k/mac/config.c

@@ -709,7 +709,7 @@ static struct mac_model mac_data_table[] = {
 		.name		= "PowerBook 520",
 		.name		= "PowerBook 520",
 		.adb_type	= MAC_ADB_PB2,
 		.adb_type	= MAC_ADB_PB2,
 		.via_type	= MAC_VIA_QUADRA,
 		.via_type	= MAC_VIA_QUADRA,
-		.scsi_type	= MAC_SCSI_LATE,
+		.scsi_type	= MAC_SCSI_OLD,
 		.scc_type	= MAC_SCC_QUADRA,
 		.scc_type	= MAC_SCC_QUADRA,
 		.ether_type	= MAC_ETHER_SONIC,
 		.ether_type	= MAC_ETHER_SONIC,
 		.floppy_type	= MAC_FLOPPY_SWIM_ADDR2,
 		.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 = {
 static const struct resource mac_scsi_ccl_rsrc[] __initconst = {
 	{
 	{
 		.flags = IORESOURCE_IRQ,
 		.flags = IORESOURCE_IRQ,
@@ -1064,11 +1052,6 @@ int __init mac_platform_init(void)
 		platform_device_register_simple("mac_scsi", 0,
 		platform_device_register_simple("mac_scsi", 0,
 			mac_scsi_old_rsrc, ARRAY_SIZE(mac_scsi_old_rsrc));
 			mac_scsi_old_rsrc, ARRAY_SIZE(mac_scsi_old_rsrc));
 		break;
 		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:
 	case MAC_SCSI_LC:
 		/* Addresses from Mac LC data in Designing Cards & Drivers 3ed.
 		/* Addresses from Mac LC data in Designing Cards & Drivers 3ed.
 		 * Also from the Developer Notes for Classic II, LC III,
 		 * Also from the Developer Notes for Classic II, LC III,