[commits] r2503 - in /trunk/libc: ./ sysdeps/unix/sysv/linux/powerpc/

[nathan@xxxxxxxxxx]

Author: nathan
Date: Wed Jun 13 05:20:20 2007
New Revision: 2503

Log:
	* sysdeps/unix/sysv/linux/powerpc/libc-start.c
	(__libc_start_main): Detect 8xx parts and clear
	__cache_line_size if detected.
	* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
	(DL_PLATFORM_AUXV): Likewise.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
    trunk/libc/sysdeps/unix/sysv/linux/powerpc/libc-start.c

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Wed Jun 13 05:20:20 2007
@@ -1,3 +1,12 @@
+2007-06-13  Nathan Sidwell  <nathan@xxxxxxxxxxxxxxxx>
+	    Mark Shinwell  <shinwell@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/powerpc/libc-start.c
+	(__libc_start_main): Detect 8xx parts and clear
+	__cache_line_size if detected.
+	* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
+	(DL_PLATFORM_AUXV): Likewise.
+
 2007-06-11  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	Add the OPTION_EGLIBC_CHARSETS option group.

Modified: trunk/libc/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c Wed Jun 13 05:20:20 2007
@@ -27,9 +27,21 @@
 /* Scan the Aux Vector for the "Data Cache Block Size" entry.  If found
    verify that the static extern __cache_line_size is defined by checking
    for not NULL.  If it is defined then assign the cache block size
-   value to __cache_line_size.  */
+   value to __cache_line_size.  This is used by memset to
+   optimize setting to zero.  We have to detect 8xx processors, which
+   have buggy dcbz implementations that cannot report page faults
+   correctly.  That requires reading SPR, which is a privileged
+   operation.  Fortunately 2.2.18 and later emulates PowerPC mfspr
+   reads from the PVR register.   */
 #define DL_PLATFORM_AUXV						      \
       case AT_DCACHEBSIZE:						      \
+	if (__LINUX_KERNEL_VERSION >= 0x020218)				      \
+	  {								      \
+	    unsigned pvr = 0;						      \
+	    asm ("mfspr %0, 287" : "=r" (pvr));				      \
+	    if ((pvr & 0xffff0000) == 0x00500000)			      \
+	      break;							      \
+	  }								      \
 	__cache_line_size = av->a_un.a_val;				      \
 	break;
 

Modified: trunk/libc/sysdeps/unix/sysv/linux/powerpc/libc-start.c
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/powerpc/libc-start.c (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/powerpc/libc-start.c Wed Jun 13 05:20:20 2007
@@ -109,11 +109,24 @@
       rtld_fini = NULL;
     }
 
-  /* Initialize the __cache_line_size variable from the aux vector.  */
+  /* Initialize the __cache_line_size variable from the aux vector.
+     This is used by memset to optimize setting to zero.  We have to
+     detect 8xx processors, which have buggy dcbz implementations that
+     cannot report page faults correctly.  That requires reading SPR,
+     which is a privileged operation.  Fortunately 2.2.18 and later
+     emulates PowerPC mfspr reads from the PVR register.  */
   for (ElfW (auxv_t) * av = auxvec; av->a_type != AT_NULL; ++av)
     switch (av->a_type)
       {
       case AT_DCACHEBSIZE:
+	if (__LINUX_KERNEL_VERSION >= 0x020218)
+	  {
+	    unsigned pvr = 0;
+	    
+	    asm ("mfspr %0, 287" : "=r" (pvr) :);
+	    if ((pvr & 0xffff0000) == 0x00500000)
+	      break;
+	  }
 	__cache_line_size = av->a_un.a_val;
 	break;
       }