From b1c56c68b0984833339c0e8d637e75fc0c57cc54 Mon Sep 17 00:00:00 2001
From: Scott Long <scottl@FreeBSD.org>
Date: Wed, 1 Jun 2005 07:11:17 +0000
Subject: [PATCH] Add a text description for the Intel IOP302/303 processors. 
 Be slightly more verbose about the allocation of RAM on the controller.

Sbumitted by: Jeremy Chadwick
PR: kern/81259
MFC-After: 3 days
---
 sys/dev/aac/aac.c        | 7 +++++--
 sys/dev/aac/aac_tables.h | 1 +
 sys/dev/aac/aacreg.h     | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index ea71528fe9dc..d8e1d1afc631 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -2353,9 +2353,12 @@ aac_describe_controller(struct aac_softc *sc)
 	sc->aac_revision = info->KernelRevision;
 
 	if (bootverbose) {
-		device_printf(sc->aac_dev, "%s %dMHz, %dMB cache memory, %s\n", 
+		device_printf(sc->aac_dev, "%s %dMHz, %dMB memory "
+		    "(%dMB cache, %dMB execution), %s\n", 
 		    aac_describe_code(aac_cpu_variant, info->CpuVariant),
-		    info->ClockSpeed, info->BufferMem / (1024 * 1024), 
+		    info->ClockSpeed, info->TotalMem / (1024 * 1024), 
+		    info->BufferMem / (1024 * 1024),
+		    info->ExecutionMem / (1024 * 1024),
 		    aac_describe_code(aac_battery_platform,
 		    info->batteryPlatform));
 
diff --git a/sys/dev/aac/aac_tables.h b/sys/dev/aac/aac_tables.h
index 47ebd0360764..4ce82ac1dd3b 100644
--- a/sys/dev/aac/aac_tables.h
+++ b/sys/dev/aac/aac_tables.h
@@ -83,6 +83,7 @@ static struct aac_code_lookup aac_cpu_variant[] = {
 	{"MPC824x",		CPUMPC_824x},
 	{"Unknown StrongARM",	CPUARM_xxx},
 	{"Unknown PowerPC",	CPUPPC_xxx},
+	{"IOP302/303",		CPUI960_30X},
 	{NULL, 0},
 	{"Unknown processor",	0}
 };
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index 9116beb3eba1..11357e32dcb8 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -429,6 +429,7 @@ typedef enum {
 	CPUARM_xxx,
 	CPUMPC_824x,
 	CPUPPC_xxx,
+	CPUI960_30X,
 	CPUSUBTYPE__last
 } AAC_CpuSubType;