Date: Mon, 25 Feb 2008 00:32:19 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 136134 for review Message-ID: <200802250032.m1P0WJTQ098245@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=136134 Change 136134 by imp@imp_paco-paco on 2008/02/25 00:31:28 IFC @136132 Affected files ... .. //depot/projects/arm/src/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/cpu.c#4 integrate Differences ... ==== //depot/projects/arm/src/sys/powerpc/include/hid.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: hid.h,v 1.2 2001/08/22 21:05:25 matt Exp $ - * $FreeBSD: src/sys/powerpc/include/hid.h,v 1.3 2005/02/04 01:14:38 grehan Exp $ + * $FreeBSD: src/sys/powerpc/include/hid.h,v 1.4 2008/02/25 00:09:23 raj Exp $ */ #ifndef _POWERPC_HID_H_ @@ -65,9 +65,9 @@ #define HID0_SGE 0x00000080 /* Enable store gathering */ #define HID0_DCFA 0x00000040 /* Data cache flush assist */ #define HID0_BTIC 0x00000020 /* Enable BTIC */ -#define HID0_LRSTK 0x00000010 /* Link register stack enable (7450) */ +#define HID0_LRSTK 0x00000010 /* Link register stack enable (7450) */ #define HID0_ABE 0x00000008 /* Enable address broadcast */ -#define HID0_FOLD 0x00000008 /* Branch folding enable (7450) */ +#define HID0_FOLD 0x00000008 /* Branch folding enable (7450) */ #define HID0_BHT 0x00000004 /* Enable branch history table */ #define HID0_NOPTI 0x00000001 /* No-op the dcbt(st) */ @@ -85,6 +85,13 @@ "\020ICE\017DCE\016ILOCK\015DLOCK\014ICFI\013DCFI\012SPD\011XBSEN" \ "\010SGE\007b25\006BTIC\005LRSTK\004FOLD\003BHT\002NOPDST\001NOPTI" +#define HID0_E500_BITMASK \ + "\20" \ + "\040EMCP\037b1\036b2\035b3\034b4\033b5\032b6\031b7" \ + "\030DOZE\027NAP\026SLEEP\025b11\024b12\023b13\022b14\021b15" \ + "\020b16\017TBEN\016SEL_TBCLK\015b19\014b20\013b21\012b22\011b23" \ + "\010EN_MAS7_UPDATE\007DCFA\006b26\005b27\004b28\003b29\002b30\001NOPTI" + /* * HID0 bit definitions per cpu model * ==== //depot/projects/arm/src/sys/powerpc/include/spr.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: spr.h,v 1.25 2002/08/14 15:38:40 matt Exp $ - * $FreeBSD: src/sys/powerpc/include/spr.h,v 1.6 2005/02/04 01:17:04 grehan Exp $ + * $FreeBSD: src/sys/powerpc/include/spr.h,v 1.7 2008/02/25 00:09:23 raj Exp $ */ #ifndef _POWERPC_SPR_H_ #define _POWERPC_SPR_H_ @@ -125,6 +125,8 @@ #define MPC7448 0x8004 #define MPC7410 0x800c #define MPC8245 0x8081 +#define FSL_E500v1 0x8020 +#define FSL_E500v2 0x8021 #define SPR_IBAT0U 0x210 /* .68 Instruction BAT Reg 0 Upper */ #define SPR_IBAT0U 0x210 /* .6. Instruction BAT Reg 0 Upper */ ==== //depot/projects/arm/src/sys/powerpc/powerpc/cpu.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * from $NetBSD: cpu_subr.c,v 1.1 2003/02/03 17:10:09 matt Exp $ - * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.9 2007/02/18 17:40:09 marcel Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.10 2008/02/25 00:09:23 raj Exp $ */ #include <sys/param.h> @@ -97,6 +97,8 @@ { "Motorola PowerPC 7447A", MPC7447A, REVFMT_MAJMIN }, { "Motorola PowerPC 7448", MPC7448, REVFMT_MAJMIN }, { "Motorola PowerPC 8240", MPC8240, REVFMT_MAJMIN }, + { "Freescale e500v1 core", FSL_E500v1, REVFMT_MAJMIN }, + { "Freescale e500v2 core", FSL_E500v2, REVFMT_MAJMIN }, { "Unknown PowerPC CPU", 0, REVFMT_HEX } }; @@ -121,13 +123,18 @@ vers = pvr >> 16; rev = pvr; switch (vers) { - case MPC7410: - min = (pvr >> 0) & 0xff; - maj = min <= 4 ? 1 : 2; - break; - default: - maj = (pvr >> 8) & 0xf; - min = (pvr >> 0) & 0xf; + case MPC7410: + min = (pvr >> 0) & 0xff; + maj = min <= 4 ? 1 : 2; + break; + case FSL_E500v1: + case FSL_E500v2: + maj = (pvr >> 4) & 0xf; + min = (pvr >> 0) & 0xf; + break; + default: + maj = (pvr >> 8) & 0xf; + min = (pvr >> 0) & 0xf; } for (cp = models; cp->version != 0; cp++) { @@ -146,15 +153,15 @@ printf("cpu%d: %s revision ", cpuid, name); switch (revfmt) { - case REVFMT_MAJMIN: - printf("%u.%u", maj, min); - break; - case REVFMT_HEX: - printf("0x%04x", rev); - break; - case REVFMT_DEC: - printf("%u", rev); - break; + case REVFMT_MAJMIN: + printf("%u.%u", maj, min); + break; + case REVFMT_HEX: + printf("0x%04x", rev); + break; + case REVFMT_DEC: + printf("%u", rev); + break; } hid0 = mfspr(SPR_HID0); @@ -163,96 +170,104 @@ * Configure power-saving mode. */ switch (vers) { - case MPC603: - case MPC603e: - case MPC603ev: - case MPC604ev: - case MPC750: - case IBM750FX: - case MPC7400: - case MPC7410: - case MPC8240: - case MPC8245: - /* Select DOZE mode. */ - hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); - hid0 |= HID0_DOZE | HID0_DPM; + case MPC603: + case MPC603e: + case MPC603ev: + case MPC604ev: + case MPC750: + case IBM750FX: + case MPC7400: + case MPC7410: + case MPC8240: + case MPC8245: + /* Select DOZE mode. */ + hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); + hid0 |= HID0_DOZE | HID0_DPM; #ifdef notyet - powersave = 1; + powersave = 1; #endif - break; + break; - case MPC7448: - case MPC7447A: - case MPC7457: - case MPC7455: - case MPC7450: - /* Enable the 7450 branch caches */ - hid0 |= HID0_SGE | HID0_BTIC; - hid0 |= HID0_LRSTK | HID0_FOLD | HID0_BHT; - /* Disable BTIC on 7450 Rev 2.0 or earlier and on 7457 */ - if (((pvr >> 16) == MPC7450 && (pvr & 0xFFFF) <= 0x0200) - || (pvr >> 16) == MPC7457) - hid0 &= ~HID0_BTIC; - /* Select NAP mode. */ - hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); - hid0 |= HID0_NAP | HID0_DPM; + case MPC7448: + case MPC7447A: + case MPC7457: + case MPC7455: + case MPC7450: + /* Enable the 7450 branch caches */ + hid0 |= HID0_SGE | HID0_BTIC; + hid0 |= HID0_LRSTK | HID0_FOLD | HID0_BHT; + /* Disable BTIC on 7450 Rev 2.0 or earlier and on 7457 */ + if (((pvr >> 16) == MPC7450 && (pvr & 0xFFFF) <= 0x0200) + || (pvr >> 16) == MPC7457) + hid0 &= ~HID0_BTIC; + /* Select NAP mode. */ + hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); + hid0 |= HID0_NAP | HID0_DPM; #ifdef notyet - powersave = 0; /* but don't use it */ + powersave = 0; /* but don't use it */ #endif - break; + break; - default: - /* No power-saving mode is available. */ ; + default: + /* No power-saving mode is available. */ ; } switch (vers) { - case IBM750FX: - case MPC750: - hid0 &= ~HID0_DBP; /* XXX correct? */ - hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; - break; + case IBM750FX: + case MPC750: + hid0 &= ~HID0_DBP; /* XXX correct? */ + hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; + break; + + case MPC7400: + case MPC7410: + hid0 &= ~HID0_SPD; + hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; + hid0 |= HID0_EIEC; + break; - case MPC7400: - case MPC7410: - hid0 &= ~HID0_SPD; - hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; - hid0 |= HID0_EIEC; - break; + case FSL_E500v1: + case FSL_E500v2: + hid0 |= HID0_EMCP; + break; } mtspr(SPR_HID0, hid0); switch (vers) { - case MPC7447A: - case MPC7448: - case MPC7450: - case MPC7455: - case MPC7457: - bitmask = HID0_7450_BITMASK; - break; - default: - bitmask = HID0_BITMASK; - break; + case MPC7447A: + case MPC7448: + case MPC7450: + case MPC7455: + case MPC7457: + bitmask = HID0_7450_BITMASK; + break; + case FSL_E500v1: + case FSL_E500v2: + bitmask = HID0_E500_BITMASK; + break; + default: + bitmask = HID0_BITMASK; + break; } switch (vers) { - case MPC750: - case IBM750FX: - case MPC7400: - case MPC7410: - case MPC7447A: - case MPC7448: - case MPC7450: - case MPC7455: - case MPC7457: - cpu_print_speed(); - printf("\n"); - cpu_config_l2cr(cpuid, vers); - break; - - default: - printf("\n"); - break; + case MPC750: + case IBM750FX: + case MPC7400: + case MPC7410: + case MPC7447A: + case MPC7448: + case MPC7450: + case MPC7455: + case MPC7457: + cpu_print_speed(); + printf("\n"); + cpu_config_l2cr(cpuid, vers); + break; + default: + printf("\n"); + break; } printf("cpu%d: HID0 %b\n", cpuid, hid0, bitmask); @@ -325,7 +340,7 @@ printf("cpu%d: ", cpuid); if (l2cr & L2CR_L2E) { - if (vers == MPC7450 || + if (vers == MPC7450 || vers == MPC7455 || vers == MPC7457) { u_int l3cr;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802250032.m1P0WJTQ098245>