提交 cdc2652e 编写于 作者: B Benjamin Herrenschmidt

Merge branch 'merge' into next

Bring in some important fixes from the 3.16 branch
...@@ -447,6 +447,7 @@ extern const char *powerpc_base_platform; ...@@ -447,6 +447,7 @@ extern const char *powerpc_base_platform;
CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \ CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \
CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP) CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP)
#define CPU_FTRS_POWER8E (CPU_FTRS_POWER8 | CPU_FTR_PMAO_BUG) #define CPU_FTRS_POWER8E (CPU_FTRS_POWER8 | CPU_FTR_PMAO_BUG)
#define CPU_FTRS_POWER8_DD1 (CPU_FTRS_POWER8 & ~CPU_FTR_DBELL)
#define CPU_FTRS_CELL (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \ #define CPU_FTRS_CELL (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \ CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \ CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
*/ */
#include <asm/pgtable-ppc64.h> #include <asm/pgtable-ppc64.h>
#include <asm/bug.h> #include <asm/bug.h>
#include <asm/processor.h>
/* /*
* Segment table * Segment table
...@@ -496,7 +497,7 @@ extern void slb_set_size(u16 size); ...@@ -496,7 +497,7 @@ extern void slb_set_size(u16 size);
*/ */
struct subpage_prot_table { struct subpage_prot_table {
unsigned long maxaddr; /* only addresses < this are protected */ unsigned long maxaddr; /* only addresses < this are protected */
unsigned int **protptrs[2]; unsigned int **protptrs[(TASK_SIZE_USER64 >> 43)];
unsigned int *low_prot[4]; unsigned int *low_prot[4];
}; };
......
...@@ -527,6 +527,26 @@ static struct cpu_spec __initdata cpu_specs[] = { ...@@ -527,6 +527,26 @@ static struct cpu_spec __initdata cpu_specs[] = {
.machine_check_early = __machine_check_early_realmode_p8, .machine_check_early = __machine_check_early_realmode_p8,
.platform = "power8", .platform = "power8",
}, },
{ /* Power8 DD1: Does not support doorbell IPIs */
.pvr_mask = 0xffffff00,
.pvr_value = 0x004d0100,
.cpu_name = "POWER8 (raw)",
.cpu_features = CPU_FTRS_POWER8_DD1,
.cpu_user_features = COMMON_USER_POWER8,
.cpu_user_features2 = COMMON_USER2_POWER8,
.mmu_features = MMU_FTRS_POWER8,
.icache_bsize = 128,
.dcache_bsize = 128,
.num_pmcs = 6,
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/power8",
.oprofile_type = PPC_OPROFILE_INVALID,
.cpu_setup = __setup_cpu_power8,
.cpu_restore = __restore_cpu_power8,
.flush_tlb = __flush_tlb_power8,
.machine_check_early = __machine_check_early_realmode_p8,
.platform = "power8",
},
{ /* Power8 */ { /* Power8 */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
.pvr_value = 0x004d0000, .pvr_value = 0x004d0000,
......
...@@ -611,17 +611,19 @@ static void rtas_flash_firmware(int reboot_type) ...@@ -611,17 +611,19 @@ static void rtas_flash_firmware(int reboot_type)
for (f = flist; f; f = next) { for (f = flist; f; f = next) {
/* Translate data addrs to absolute */ /* Translate data addrs to absolute */
for (i = 0; i < f->num_blocks; i++) { for (i = 0; i < f->num_blocks; i++) {
f->blocks[i].data = (char *)__pa(f->blocks[i].data); f->blocks[i].data = (char *)cpu_to_be64(__pa(f->blocks[i].data));
image_size += f->blocks[i].length; image_size += f->blocks[i].length;
f->blocks[i].length = cpu_to_be64(f->blocks[i].length);
} }
next = f->next; next = f->next;
/* Don't translate NULL pointer for last entry */ /* Don't translate NULL pointer for last entry */
if (f->next) if (f->next)
f->next = (struct flash_block_list *)__pa(f->next); f->next = (struct flash_block_list *)cpu_to_be64(__pa(f->next));
else else
f->next = NULL; f->next = NULL;
/* make num_blocks into the version/length field */ /* make num_blocks into the version/length field */
f->num_blocks = (FLASH_BLOCK_LIST_VERSION << 56) | ((f->num_blocks+1)*16); f->num_blocks = (FLASH_BLOCK_LIST_VERSION << 56) | ((f->num_blocks+1)*16);
f->num_blocks = cpu_to_be64(f->num_blocks);
} }
printk(KERN_ALERT "FLASH: flash image is %ld bytes\n", image_size); printk(KERN_ALERT "FLASH: flash image is %ld bytes\n", image_size);
......
...@@ -77,7 +77,7 @@ _GLOBAL(memset) ...@@ -77,7 +77,7 @@ _GLOBAL(memset)
stb r4,0(r6) stb r4,0(r6)
blr blr
_GLOBAL(memmove) _GLOBAL_TOC(memmove)
cmplw 0,r3,r4 cmplw 0,r3,r4
bgt backwards_memcpy bgt backwards_memcpy
b memcpy b memcpy
......
...@@ -1198,7 +1198,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) ...@@ -1198,7 +1198,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
sh = regs->gpr[rb] & 0x3f; sh = regs->gpr[rb] & 0x3f;
ival = (signed int) regs->gpr[rd]; ival = (signed int) regs->gpr[rd];
regs->gpr[ra] = ival >> (sh < 32 ? sh : 31); regs->gpr[ra] = ival >> (sh < 32 ? sh : 31);
if (ival < 0 && (sh >= 32 || (ival & ((1 << sh) - 1)) != 0)) if (ival < 0 && (sh >= 32 || (ival & ((1ul << sh) - 1)) != 0))
regs->xer |= XER_CA; regs->xer |= XER_CA;
else else
regs->xer &= ~XER_CA; regs->xer &= ~XER_CA;
...@@ -1208,7 +1208,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) ...@@ -1208,7 +1208,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
sh = rb; sh = rb;
ival = (signed int) regs->gpr[rd]; ival = (signed int) regs->gpr[rd];
regs->gpr[ra] = ival >> sh; regs->gpr[ra] = ival >> sh;
if (ival < 0 && (ival & ((1 << sh) - 1)) != 0) if (ival < 0 && (ival & ((1ul << sh) - 1)) != 0)
regs->xer |= XER_CA; regs->xer |= XER_CA;
else else
regs->xer &= ~XER_CA; regs->xer &= ~XER_CA;
...@@ -1216,7 +1216,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) ...@@ -1216,7 +1216,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
#ifdef __powerpc64__ #ifdef __powerpc64__
case 27: /* sld */ case 27: /* sld */
sh = regs->gpr[rd] & 0x7f; sh = regs->gpr[rb] & 0x7f;
if (sh < 64) if (sh < 64)
regs->gpr[ra] = regs->gpr[rd] << sh; regs->gpr[ra] = regs->gpr[rd] << sh;
else else
...@@ -1235,7 +1235,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) ...@@ -1235,7 +1235,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
sh = regs->gpr[rb] & 0x7f; sh = regs->gpr[rb] & 0x7f;
ival = (signed long int) regs->gpr[rd]; ival = (signed long int) regs->gpr[rd];
regs->gpr[ra] = ival >> (sh < 64 ? sh : 63); regs->gpr[ra] = ival >> (sh < 64 ? sh : 63);
if (ival < 0 && (sh >= 64 || (ival & ((1 << sh) - 1)) != 0)) if (ival < 0 && (sh >= 64 || (ival & ((1ul << sh) - 1)) != 0))
regs->xer |= XER_CA; regs->xer |= XER_CA;
else else
regs->xer &= ~XER_CA; regs->xer &= ~XER_CA;
...@@ -1246,7 +1246,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) ...@@ -1246,7 +1246,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
sh = rb | ((instr & 2) << 4); sh = rb | ((instr & 2) << 4);
ival = (signed long int) regs->gpr[rd]; ival = (signed long int) regs->gpr[rd];
regs->gpr[ra] = ival >> sh; regs->gpr[ra] = ival >> sh;
if (ival < 0 && (ival & ((1 << sh) - 1)) != 0) if (ival < 0 && (ival & ((1ul << sh) - 1)) != 0)
regs->xer |= XER_CA; regs->xer |= XER_CA;
else else
regs->xer &= ~XER_CA; regs->xer &= ~XER_CA;
......
...@@ -1307,6 +1307,9 @@ static void power_pmu_enable(struct pmu *pmu) ...@@ -1307,6 +1307,9 @@ static void power_pmu_enable(struct pmu *pmu)
out_enable: out_enable:
pmao_restore_workaround(ebb); pmao_restore_workaround(ebb);
if (ppmu->flags & PPMU_ARCH_207S)
mtspr(SPRN_MMCR2, 0);
mmcr0 = ebb_switch_in(ebb, cpuhw->mmcr[0]); mmcr0 = ebb_switch_in(ebb, cpuhw->mmcr[0]);
mb(); mb();
...@@ -1315,9 +1318,6 @@ static void power_pmu_enable(struct pmu *pmu) ...@@ -1315,9 +1318,6 @@ static void power_pmu_enable(struct pmu *pmu)
write_mmcr0(cpuhw, mmcr0); write_mmcr0(cpuhw, mmcr0);
if (ppmu->flags & PPMU_ARCH_207S)
mtspr(SPRN_MMCR2, 0);
/* /*
* Enable instruction sampling if necessary * Enable instruction sampling if necessary
*/ */
......
...@@ -249,7 +249,7 @@ static void elog_work_fn(struct work_struct *work) ...@@ -249,7 +249,7 @@ static void elog_work_fn(struct work_struct *work)
rc = opal_get_elog_size(&id, &size, &type); rc = opal_get_elog_size(&id, &size, &type);
if (rc != OPAL_SUCCESS) { if (rc != OPAL_SUCCESS) {
pr_err("ELOG: Opal log read failed\n"); pr_err("ELOG: OPAL log info read failed\n");
return; return;
} }
...@@ -257,7 +257,7 @@ static void elog_work_fn(struct work_struct *work) ...@@ -257,7 +257,7 @@ static void elog_work_fn(struct work_struct *work)
log_id = be64_to_cpu(id); log_id = be64_to_cpu(id);
elog_type = be64_to_cpu(type); elog_type = be64_to_cpu(type);
BUG_ON(elog_size > OPAL_MAX_ERRLOG_SIZE); WARN_ON(elog_size > OPAL_MAX_ERRLOG_SIZE);
if (elog_size >= OPAL_MAX_ERRLOG_SIZE) if (elog_size >= OPAL_MAX_ERRLOG_SIZE)
elog_size = OPAL_MAX_ERRLOG_SIZE; elog_size = OPAL_MAX_ERRLOG_SIZE;
......
...@@ -86,6 +86,7 @@ static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa, ...@@ -86,6 +86,7 @@ static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa,
} }
of_node_set_flag(dn, OF_DYNAMIC); of_node_set_flag(dn, OF_DYNAMIC);
of_node_init(dn);
return dn; return dn;
} }
......
...@@ -69,6 +69,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist ...@@ -69,6 +69,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
np->properties = proplist; np->properties = proplist;
of_node_set_flag(np, OF_DYNAMIC); of_node_set_flag(np, OF_DYNAMIC);
of_node_init(np);
np->parent = derive_parent(path); np->parent = derive_parent(path);
if (IS_ERR(np->parent)) { if (IS_ERR(np->parent)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册