6 files changed, 157 insertions, 16 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 39e348a3ade2..3f7182db9ed5 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -57,6 +57,8 @@ extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
                                  PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP)
 #define COMMON_USER_POWER5_PLUS (COMMON_USER_PPC64 | PPC_FEATURE_POWER5_PLUS|\
                                  PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP)
+#define COMMON_USER_POWER6      (COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_05 |\
+                                 PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP)
 #define COMMON_USER_BOOKE       (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \
                                  PPC_FEATURE_BOOKE)
 
@@ -263,6 +265,20 @@ struct cpu_spec	cpu_specs[] = {
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .platform               = "power5+",
         },
+        {       /* Power6 */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x003e0000,
+                .cpu_name               = "POWER6",
+                .cpu_features           = CPU_FTRS_POWER6,
+                .cpu_user_features      = COMMON_USER_POWER6,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .num_pmcs               = 6,
+                .cpu_setup              = __setup_cpu_power4,
+                .oprofile_cpu_type      = "ppc64/power6",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .platform               = "power6",
+        },
         {       /* Cell Broadband Engine */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x00700000,
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index 928b8581fcb0..ba34001fca8e 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -191,11 +191,19 @@ int module_frob_arch_sections(Elf64_Ehdr *hdr,
                                  (void *)hdr
                                  + sechdrs[sechdrs[i].sh_link].sh_offset);
         }
-        if (!me->arch.stubs_section || !me->arch.toc_section) {
-                printk("%s: doesn't contain .toc or .stubs.\n", me->name);
+
+        if (!me->arch.stubs_section) {
+                printk("%s: doesn't contain .stubs.\n", me->name);
                 return -ENOEXEC;
         }
 
+        /* If we don't have a .toc, just use .stubs.  We need to set r2
+           to some reasonable value in case the module calls out to
+           other functions via a stub, or if a function pointer escapes
+           the module by some means.  */
+        if (!me->arch.toc_section)
+                me->arch.toc_section = me->arch.stubs_section;
+
         /* Override the stubs size */
         sechdrs[me->arch.stubs_section].sh_size = get_stubs_size(hdr, sechdrs);
         return 0;
@@ -342,7 +350,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
                         break;
 
                 case R_PPC64_TOC16:
-                        /* Subtact TOC pointer */
+                        /* Subtract TOC pointer */
                         value -= my_r2(sechdrs, me);
                         if (value + 0x8000 > 0xffff) {
                                 printk("%s: bad TOC16 relocation (%lu)\n",
@@ -355,7 +363,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
                         break;
 
                 case R_PPC64_TOC16_DS:
-                        /* Subtact TOC pointer */
+                        /* Subtract TOC pointer */
                         value -= my_r2(sechdrs, me);
                         if ((value & 3) != 0 || value + 0x8000 > 0xffff) {
                                 printk("%s: bad TOC16_DS relocation (%lu)\n",
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 7e4d54821a07..078fb5533541 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -636,10 +636,96 @@ static void __init early_cmdline_parse(void)
 
 #ifdef CONFIG_PPC_PSERIES
 /*
- * To tell the firmware what our capabilities are, we have to pass
- * it a fake 32-bit ELF header containing a couple of PT_NOTE sections
- * that contain structures that contain the actual values.
+ * There are two methods for telling firmware what our capabilities are.
+ * Newer machines have an "ibm,client-architecture-support" method on the
+ * root node.  For older machines, we have to call the "process-elf-header"
+ * method in the /packages/elf-loader node, passing it a fake 32-bit
+ * ELF header containing a couple of PT_NOTE sections that contain
+ * structures that contain various information.
  */
+
+/*
+ * New method - extensible architecture description vector.
+ *
+ * Because the description vector contains a mix of byte and word
+ * values, we declare it as an unsigned char array, and use this
+ * macro to put word values in.
+ */
+#define W(x)    ((x) >> 24) & 0xff, ((x) >> 16) & 0xff, \
+                ((x) >> 8) & 0xff, (x) & 0xff
+
+/* Option vector bits - generic bits in byte 1 */
+#define OV_IGNORE               0x80    /* ignore this vector */
+#define OV_CESSATION_POLICY     0x40    /* halt if unsupported option present*/
+
+/* Option vector 1: processor architectures supported */
+#define OV1_PPC_2_00            0x80    /* set if we support PowerPC 2.00 */
+#define OV1_PPC_2_01            0x40    /* set if we support PowerPC 2.01 */
+#define OV1_PPC_2_02            0x20    /* set if we support PowerPC 2.02 */
+#define OV1_PPC_2_03            0x10    /* set if we support PowerPC 2.03 */
+#define OV1_PPC_2_04            0x08    /* set if we support PowerPC 2.04 */
+#define OV1_PPC_2_05            0x04    /* set if we support PowerPC 2.05 */
+
+/* Option vector 2: Open Firmware options supported */
+#define OV2_REAL_MODE           0x20    /* set if we want OF in real mode */
+
+/* Option vector 3: processor options supported */
+#define OV3_FP                  0x80    /* floating point */
+#define OV3_VMX                 0x40    /* VMX/Altivec */
+
+/* Option vector 5: PAPR/OF options supported */
+#define OV5_LPAR                0x80    /* logical partitioning supported */
+#define OV5_SPLPAR              0x40    /* shared-processor LPAR supported */
+/* ibm,dynamic-reconfiguration-memory property supported */
+#define OV5_DRCONF_MEMORY       0x20
+#define OV5_LARGE_PAGES         0x10    /* large pages supported */
+
+/*
+ * The architecture vector has an array of PVR mask/value pairs,
+ * followed by # option vectors - 1, followed by the option vectors.
+ */
+static unsigned char ibm_architecture_vec[] = {
+        W(0xfffe0000), W(0x003a0000),   /* POWER5/POWER5+ */
+        W(0xffff0000), W(0x003e0000),   /* POWER6 */
+        W(0xfffffffe), W(0x0f000001),   /* all 2.04-compliant and earlier */
+        5 - 1,                          /* 5 option vectors */
+
+        /* option vector 1: processor architectures supported */
+        3 - 1,                          /* length */
+        0,                              /* don't ignore, don't halt */
+        OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 |
+        OV1_PPC_2_04 | OV1_PPC_2_05,
+
+        /* option vector 2: Open Firmware options supported */
+        34 - 1,                         /* length */
+        OV2_REAL_MODE,
+        0, 0,
+        W(0xffffffff),                  /* real_base */
+        W(0xffffffff),                  /* real_size */
+        W(0xffffffff),                  /* virt_base */
+        W(0xffffffff),                  /* virt_size */
+        W(0xffffffff),                  /* load_base */
+        W(64),                          /* 128MB min RMA */
+        W(0xffffffff),                  /* full client load */
+        0,                              /* min RMA percentage of total RAM */
+        48,                             /* max log_2(hash table size) */
+
+        /* option vector 3: processor options supported */
+        3 - 1,                          /* length */
+        0,                              /* don't ignore, don't halt */
+        OV3_FP | OV3_VMX,
+
+        /* option vector 4: IBM PAPR implementation */
+        2 - 1,                          /* length */
+        0,                              /* don't halt */
+
+        /* option vector 5: PAPR/OF options */
+        3 - 1,                          /* length */
+        0,                              /* don't ignore, don't halt */
+        OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES,
+};
+
+/* Old method - ELF header with PT_NOTE sections */
 static struct fake_elf {
         Elf32_Ehdr      elfhdr;
         Elf32_Phdr      phdr[2];
@@ -728,8 +814,26 @@ static struct fake_elf {
 
 static void __init prom_send_capabilities(void)
 {
-        ihandle elfloader;
+        ihandle elfloader, root;
+        prom_arg_t ret;
+
+        root = call_prom("open", 1, 1, ADDR("/"));
+        if (root != 0) {
+                /* try calling the ibm,client-architecture-support method */
+                if (call_prom_ret("call-method", 3, 2, &ret,
+                                  ADDR("ibm,client-architecture-support"),
+                                  ADDR(ibm_architecture_vec)) == 0) {
+                        /* the call exists... */
+                        if (ret)
+                                prom_printf("WARNING: ibm,client-architecture"
+                                            "-support call FAILED!\n");
+                        call_prom("close", 1, 0, root);
+                        return;
+                }
+                call_prom("close", 1, 0, root);
+        }
 
+        /* no ibm,client-architecture-support call, try the old way */
         elfloader = call_prom("open", 1, 1, ADDR("/packages/elf-loader"));
         if (elfloader == 0) {
                 prom_printf("couldn't open /packages/elf-loader\n");
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 1d93e73a7003..684ab1d49c65 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -516,3 +516,11 @@ void probe_machine(void)
 
         printk(KERN_INFO "Using %s machine description\n", ppc_md.name);
 }
+
+int check_legacy_ioport(unsigned long base_port)
+{
+        if (ppc_md.check_legacy_ioport == NULL)
+                return 0;
+        return ppc_md.check_legacy_ioport(base_port);
+}
+EXPORT_SYMBOL(check_legacy_ioport);
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 13e91c4d70a8..4467c49903b6 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -594,14 +594,6 @@ void ppc64_terminate_msg(unsigned int src, const char *msg)
         printk("[terminate]%04x %s\n", src, msg);
 }
 
-int check_legacy_ioport(unsigned long base_port)
-{
-        if (ppc_md.check_legacy_ioport == NULL)
-                return 0;
-        return ppc_md.check_legacy_ioport(base_port);
-}
-EXPORT_SYMBOL(check_legacy_ioport);
-
 void cpu_die(void)
 {
         if (ppc_md.cpu_die)
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index 0b98eea73c5e..cf56a1d499ff 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -325,6 +325,19 @@ SYSCALL(unshare)
 SYSCALL(splice)
 SYSCALL(tee)
 SYSCALL(vmsplice)
+COMPAT_SYS(openat)
+SYSCALL(mkdirat)
+SYSCALL(mknodat)
+SYSCALL(fchownat)
+COMPAT_SYS(futimesat)
+SYSX(sys_newfstatat, sys_fstatat64, sys_fstatat64)
+SYSCALL(unlinkat)
+SYSCALL(renameat)
+SYSCALL(linkat)
+SYSCALL(symlinkat)
+SYSCALL(readlinkat)
+SYSCALL(fchmodat)
+SYSCALL(faccessat)
 
 /*
  * please add new calls to arch/powerpc/platforms/cell/spu_callbacks.c