Date: Mon, 18 Feb 2008 21:12:32 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135677 for review Message-ID: <200802182112.m1ILCWMn091962@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=135677 Change 135677 by raj@raj_mimi on 2008/02/18 21:12:15 Improve HID0 fields recognition on E500 core (SEL_TBCLK). While there, eliminate redundant 7450 bitmask definition, other style fixes. Affected files ... .. //depot/projects/e500/sys/powerpc/include/hid.h#3 edit Differences ... ==== //depot/projects/e500/sys/powerpc/include/hid.h#3 (text+ko) ==== @@ -64,21 +64,14 @@ #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) */ #if defined(AIM) -#define HID0_7450_BITMASK \ - "\20" \ - "\040EMCP\037b1\036b2\035b3\034b4\033TBEN\032b6\031STEN" \ - "\030HBATEN\027NAP\026SLEEP\025DPM\024b12\023BHTCLR\022XAEN\021NHR" \ - "\020ICE\017DCE\016ILOCK\015DLOCK\014ICFI\013DCFI\012SPD\011XBSEN" \ - "\010SGE\007b25\006BTIC\005LRSTK\004FOLD\003BHT\002NOPDST\001NOPTI" - #define HID0_TBEN 0x04000000 /* Time base enable (7450) */ #elif defined(E500) @@ -107,45 +100,45 @@ "\20" \ "\040EMCP\037b1\036b2\035b3\034b4\033b5\032b6\031b7" \ "\030DOZE\027NAP\026SLEEP\025b11\024b12\023b13\022b14\021b15" \ - "\020b16\017TBEN\016b18\015b19\014b20\013b21\012b22\011b23" \ + "\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 * - * bit 603 604 750 7400 7410 7450 7457 e500 - * 0 EMCP EMCP EMCP EMCP EMCP - - EMCP - * 1 - ECP DBP - - - - - - * 2 EBA EBA EBA EBA EDA - - - - * 3 EBD EBD EBD EBD EBD - - - - * 4 SBCLK - BCLK BCKL BCLK - - - - * 5 EICE - - - - TBEN TBEN - - * 6 ECLK - ECLK ECLK ECLK - - - - * 7 PAR PAR PAR PAR PAR STEN STEN - - * 8 DOZE - DOZE DOZE DOZE - HBATEN DOZE - * 9 NAP - NAP NAP NAP NAP NAP NAP - * 10 SLEEP - SLEEP SLEEP SLEEP SLEEP SLEEP SLEEP - * 11 DPM - DPM DPM DPM DPM DPM - - * 12 RISEG - - RISEG - - - - - * 13 - - - EIEC EIEC BHTCLR BHTCLR - - * 14 - - - - - XAEN XAEN - - * 15 - NHR NHR NHR NHR NHR NHR - - * 16 ICE ICE ICE ICE ICE ICE ICE - - * 17 DCE DCE DCE DCE DCE DCE DCE TBEN - * 18 ILOCK ILOCK ILOCK ILOCK ILOCK ILOCK ILOCK SEL_TBCLK - * 19 DLOCK DLOCK DLOCK DLOCK DLOCK DLOCK DLOCK - - * 20 ICFI ICFI ICFI ICFI ICFI ICFI ICFI - - * 21 DCFI DCFI DCFI DCFI DCFI DCFI DCFI - - * 22 - - SPD SPD SPG SPD SPD - - * 23 - - IFEM IFTT IFTT - XBSEN - - * 24 - SIE SGE SGE SGE SGE SGE EN_MAS7_UPDATE - * 25 - - DCFA DCFA DCFA - - DCFA - * 26 - - BTIC BTIC BTIC BTIC BTIC - - * 27 FBIOB - - - - LRSTK LRSTK - - * 28 - - ABE - - FOLD FOLD - - * 29 - BHT BHT BHT BHT BHT BHT - - * 30 - - - NOPDST NOPDST NOPDST NOPDST - - * 31 NOOPTI - NOOPTI NOPTI NOPTI NOPTI NOPTI NOPTI + * bit 603 604 750 7400 7410 7450 7457 e500 + * 0 EMCP EMCP EMCP EMCP EMCP - - EMCP + * 1 - ECP DBP - - - - - + * 2 EBA EBA EBA EBA EDA - - - + * 3 EBD EBD EBD EBD EBD - - - + * 4 SBCLK - BCLK BCKL BCLK - - - + * 5 EICE - - - - TBEN TBEN - + * 6 ECLK - ECLK ECLK ECLK - - - + * 7 PAR PAR PAR PAR PAR STEN STEN - + * 8 DOZE - DOZE DOZE DOZE - HBATEN DOZE + * 9 NAP - NAP NAP NAP NAP NAP NAP + * 10 SLEEP - SLEEP SLEEP SLEEP SLEEP SLEEP SLEEP + * 11 DPM - DPM DPM DPM DPM DPM - + * 12 RISEG - - RISEG - - - - + * 13 - - - EIEC EIEC BHTCLR BHTCLR - + * 14 - - - - - XAEN XAEN - + * 15 - NHR NHR NHR NHR NHR NHR - + * 16 ICE ICE ICE ICE ICE ICE ICE - + * 17 DCE DCE DCE DCE DCE DCE DCE TBEN + * 18 ILOCK ILOCK ILOCK ILOCK ILOCK ILOCK ILOCK SEL_TBCLK + * 19 DLOCK DLOCK DLOCK DLOCK DLOCK DLOCK DLOCK - + * 20 ICFI ICFI ICFI ICFI ICFI ICFI ICFI - + * 21 DCFI DCFI DCFI DCFI DCFI DCFI DCFI - + * 22 - - SPD SPD SPG SPD SPD - + * 23 - - IFEM IFTT IFTT - XBSEN - + * 24 - SIE SGE SGE SGE SGE SGE EN_MAS7_UPDATE + * 25 - - DCFA DCFA DCFA - - DCFA + * 26 - - BTIC BTIC BTIC BTIC BTIC - + * 27 FBIOB - - - - LRSTK LRSTK - + * 28 - - ABE - - FOLD FOLD - + * 29 - BHT BHT BHT BHT BHT BHT - + * 30 - - - NOPDST NOPDST NOPDST NOPDST - + * 31 NOOPTI - NOOPTI NOPTI NOPTI NOPTI NOPTI NOPTI * * 604: ECP = Enable cache parity checking * 604: SIE = Serial instruction execution disable
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802182112.m1ILCWMn091962>