lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'powerpc-4.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Browse Source 
Pull powerpc fixes from Michael Ellerman:

 - Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER

 - Little endian fixes for post mobility device tree update

 - Add PVR for POWER8NVL processor

 - Fixes for hypervisor doorbell handling

* tag 'powerpc-4.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER
  powerpc/pseries: Little endian fixes for post mobility device tree update
  powerpc: Add PVR for POWER8NVL processor
  powerpc/powernv: Fixes for hypervisor doorbell handling
This commit is contained in:
Linus Torvalds
2015-03-24 17:23:03 -07:00
parent 0d33cd0afb 44d5f6f590
commit a55feeb103
7 changed files with 64 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/include/asm/ppc-opcode.h
View File

@@ -153,6 +153,7 @@
#define PPC_INST_MFSPR_PVR_MASK 0xfc1fffff #define PPC_INST_MFSPR_PVR_MASK 0xfc1fffff
#define PPC_INST_MFTMR 0x7c0002dc #define PPC_INST_MFTMR 0x7c0002dc
#define PPC_INST_MSGSND 0x7c00019c #define PPC_INST_MSGSND 0x7c00019c
#define PPC_INST_MSGCLR 0x7c0001dc
#define PPC_INST_MSGSNDP 0x7c00011c #define PPC_INST_MSGSNDP 0x7c00011c
#define PPC_INST_MTTMR 0x7c0003dc #define PPC_INST_MTTMR 0x7c0003dc
#define PPC_INST_NOP 0x60000000 #define PPC_INST_NOP 0x60000000
@@ -309,6 +310,8 @@
___PPC_RB(b) | __PPC_EH(eh)) ___PPC_RB(b) | __PPC_EH(eh))
#define PPC_MSGSND(b) stringify_in_c(.long PPC_INST_MSGSND | \ #define PPC_MSGSND(b) stringify_in_c(.long PPC_INST_MSGSND | \
___PPC_RB(b)) ___PPC_RB(b))
#define PPC_MSGCLR(b) stringify_in_c(.long PPC_INST_MSGCLR | \
___PPC_RB(b))
#define PPC_MSGSNDP(b) stringify_in_c(.long PPC_INST_MSGSNDP | \ #define PPC_MSGSNDP(b) stringify_in_c(.long PPC_INST_MSGSNDP | \
___PPC_RB(b)) ___PPC_RB(b))
#define PPC_POPCNTB(a, s) stringify_in_c(.long PPC_INST_POPCNTB | \ #define PPC_POPCNTB(a, s) stringify_in_c(.long PPC_INST_POPCNTB | \

3
arch/powerpc/include/asm/reg.h
View File

@@ -608,13 +608,16 @@
#define SRR1_ISI_N_OR_G 0x10000000 /* ISI: Access is no-exec or G */ #define SRR1_ISI_N_OR_G 0x10000000 /* ISI: Access is no-exec or G */
#define SRR1_ISI_PROT 0x08000000 /* ISI: Other protection fault */ #define SRR1_ISI_PROT 0x08000000 /* ISI: Other protection fault */
#define SRR1_WAKEMASK 0x00380000 /* reason for wakeup */ #define SRR1_WAKEMASK 0x00380000 /* reason for wakeup */
#define SRR1_WAKEMASK_P8 0x003c0000 /* reason for wakeup on POWER8 */
#define SRR1_WAKESYSERR 0x00300000 /* System error */ #define SRR1_WAKESYSERR 0x00300000 /* System error */
#define SRR1_WAKEEE 0x00200000 /* External interrupt */ #define SRR1_WAKEEE 0x00200000 /* External interrupt */
#define SRR1_WAKEMT 0x00280000 /* mtctrl */ #define SRR1_WAKEMT 0x00280000 /* mtctrl */
#define SRR1_WAKEHMI 0x00280000 /* Hypervisor maintenance */ #define SRR1_WAKEHMI 0x00280000 /* Hypervisor maintenance */
#define SRR1_WAKEDEC 0x00180000 /* Decrementer interrupt */ #define SRR1_WAKEDEC 0x00180000 /* Decrementer interrupt */
#define SRR1_WAKEDBELL 0x00140000 /* Privileged doorbell on P8 */
#define SRR1_WAKETHERM 0x00100000 /* Thermal management interrupt */ #define SRR1_WAKETHERM 0x00100000 /* Thermal management interrupt */
#define SRR1_WAKERESET 0x00100000 /* System reset */ #define SRR1_WAKERESET 0x00100000 /* System reset */
#define SRR1_WAKEHDBELL 0x000c0000 /* Hypervisor doorbell on P8 */
#define SRR1_WAKESTATE 0x00030000 /* Powersave exit mask [46:47] */ #define SRR1_WAKESTATE 0x00030000 /* Powersave exit mask [46:47] */
#define SRR1_WS_DEEPEST 0x00030000 /* Some resources not maintained, #define SRR1_WS_DEEPEST 0x00030000 /* Some resources not maintained,
* may not be recoverable */ * may not be recoverable */

20
arch/powerpc/kernel/cputable.c
View File

@@ -437,6 +437,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",
}, },
{ /* Power8NVL */
.pvr_mask = 0xffff0000,
.pvr_value = 0x004c0000,
.cpu_name = "POWER8NVL (raw)",
.cpu_features = CPU_FTRS_POWER8,
.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 DD1: Does not support doorbell IPIs */ { /* Power8 DD1: Does not support doorbell IPIs */
.pvr_mask = 0xffffff00, .pvr_mask = 0xffffff00,
.pvr_value = 0x004d0100, .pvr_value = 0x004d0100,

2
arch/powerpc/kernel/dbell.c
View File

@@ -17,6 +17,7 @@
#include <asm/dbell.h> #include <asm/dbell.h>
#include <asm/irq_regs.h> #include <asm/irq_regs.h>
#include <asm/kvm_ppc.h>
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
void doorbell_setup_this_cpu(void) void doorbell_setup_this_cpu(void)
@@ -41,6 +42,7 @@ void doorbell_exception(struct pt_regs *regs)
may_hard_irq_enable(); may_hard_irq_enable();
kvmppc_set_host_ipi(smp_processor_id(), 0);
__this_cpu_inc(irq_stat.doorbell_irqs); __this_cpu_inc(irq_stat.doorbell_irqs);
smp_ipi_demux(); smp_ipi_demux();

2
arch/powerpc/kernel/exceptions-64s.S
View File

@@ -1408,7 +1408,7 @@ machine_check_handle_early:
bne 9f /* continue in V mode if we are. */ bne 9f /* continue in V mode if we are. */
5: 5:
#ifdef CONFIG_KVM_BOOK3S_64_HV #ifdef CONFIG_KVM_BOOK3S_64_HANDLER
/* /*
* We are coming from kernel context. Check if we are coming from * We are coming from kernel context. Check if we are coming from
* guest. if yes, then we can continue. We will fall through * guest. if yes, then we can continue. We will fall through

14
arch/powerpc/platforms/powernv/smp.c
View File

@@ -33,6 +33,8 @@
#include <asm/runlatch.h> #include <asm/runlatch.h>
#include <asm/code-patching.h> #include <asm/code-patching.h>
#include <asm/dbell.h> #include <asm/dbell.h>
#include <asm/kvm_ppc.h>
#include <asm/ppc-opcode.h>
#include "powernv.h" #include "powernv.h"
@@ -149,7 +151,7 @@ static int pnv_smp_cpu_disable(void)
static void pnv_smp_cpu_kill_self(void) static void pnv_smp_cpu_kill_self(void)
{ {
unsigned int cpu; unsigned int cpu;
unsigned long srr1; unsigned long srr1, wmask;
u32 idle_states; u32 idle_states;
/* Standard hot unplug procedure */ /* Standard hot unplug procedure */
@@ -161,6 +163,10 @@ static void pnv_smp_cpu_kill_self(void)
generic_set_cpu_dead(cpu); generic_set_cpu_dead(cpu);
smp_wmb(); smp_wmb();
wmask = SRR1_WAKEMASK;
if (cpu_has_feature(CPU_FTR_ARCH_207S))
wmask = SRR1_WAKEMASK_P8;
idle_states = pnv_get_supported_cpuidle_states(); idle_states = pnv_get_supported_cpuidle_states();
/* We don't want to take decrementer interrupts while we are offline, /* We don't want to take decrementer interrupts while we are offline,
* so clear LPCR:PECE1. We keep PECE2 enabled. * so clear LPCR:PECE1. We keep PECE2 enabled.
@@ -191,10 +197,14 @@ static void pnv_smp_cpu_kill_self(void)
* having finished executing in a KVM guest, then srr1 * having finished executing in a KVM guest, then srr1
* contains 0. * contains 0.
*/ */
if ((srr1 & SRR1_WAKEMASK) == SRR1_WAKEEE) { if ((srr1 & wmask) == SRR1_WAKEEE) {
icp_native_flush_interrupt(); icp_native_flush_interrupt();
local_paca->irq_happened &= PACA_IRQ_HARD_DIS; local_paca->irq_happened &= PACA_IRQ_HARD_DIS;
smp_mb(); smp_mb();
} else if ((srr1 & wmask) == SRR1_WAKEHDBELL) {
unsigned long msg = PPC_DBELL_TYPE(PPC_DBELL_SERVER);
asm volatile(PPC_MSGCLR(%0) : : "r" (msg));
kvmppc_set_host_ipi(cpu, 0);
} }
if (cpu_core_split_required()) if (cpu_core_split_required())

44
arch/powerpc/platforms/pseries/mobility.c
View File

@@ -25,10 +25,10 @@
static struct kobject *mobility_kobj; static struct kobject *mobility_kobj;
struct update_props_workarea { struct update_props_workarea {
u32 phandle; __be32 phandle;
u32 state; __be32 state;
u64 reserved; __be64 reserved;
u32 nprops; __be32 nprops;
} __packed; } __packed;
#define NODE_ACTION_MASK 0xff000000 #define NODE_ACTION_MASK 0xff000000
@@ -54,11 +54,11 @@ static int mobility_rtas_call(int token, char *buf, s32 scope)
return rc; return rc;
} }
static int delete_dt_node(u32 phandle) static int delete_dt_node(__be32 phandle)
{ {
struct device_node *dn; struct device_node *dn;
dn = of_find_node_by_phandle(phandle); dn = of_find_node_by_phandle(be32_to_cpu(phandle));
if (!dn) if (!dn)
return -ENOENT; return -ENOENT;
@@ -127,7 +127,7 @@ static int update_dt_property(struct device_node *dn, struct property **prop,
return 0; return 0;
} }
static int update_dt_node(u32 phandle, s32 scope) static int update_dt_node(__be32 phandle, s32 scope)
{ {
struct update_props_workarea *upwa; struct update_props_workarea *upwa;
struct device_node *dn; struct device_node *dn;
@@ -136,6 +136,7 @@ static int update_dt_node(u32 phandle, s32 scope)
char *prop_data; char *prop_data;
char *rtas_buf; char *rtas_buf;
int update_properties_token; int update_properties_token;
u32 nprops;
u32 vd; u32 vd;
update_properties_token = rtas_token("ibm,update-properties"); update_properties_token = rtas_token("ibm,update-properties");
@@ -146,7 +147,7 @@ static int update_dt_node(u32 phandle, s32 scope)
if (!rtas_buf) if (!rtas_buf)
return -ENOMEM; return -ENOMEM;
dn = of_find_node_by_phandle(phandle); dn = of_find_node_by_phandle(be32_to_cpu(phandle));
if (!dn) { if (!dn) {
kfree(rtas_buf); kfree(rtas_buf);
return -ENOENT; return -ENOENT;
@@ -162,6 +163,7 @@ static int update_dt_node(u32 phandle, s32 scope)
break; break;
prop_data = rtas_buf + sizeof(*upwa); prop_data = rtas_buf + sizeof(*upwa);
nprops = be32_to_cpu(upwa->nprops);
/* On the first call to ibm,update-properties for a node the /* On the first call to ibm,update-properties for a node the
* the first property value descriptor contains an empty * the first property value descriptor contains an empty
@@ -170,17 +172,17 @@ static int update_dt_node(u32 phandle, s32 scope)
*/ */
if (*prop_data == 0) { if (*prop_data == 0) {
prop_data++; prop_data++;
vd = *(u32 *)prop_data; vd = be32_to_cpu(*(__be32 *)prop_data);
prop_data += vd + sizeof(vd); prop_data += vd + sizeof(vd);
upwa->nprops--; nprops--;
} }
for (i = 0; i < upwa->nprops; i++) { for (i = 0; i < nprops; i++) {
char *prop_name; char *prop_name;
prop_name = prop_data; prop_name = prop_data;
prop_data += strlen(prop_name) + 1; prop_data += strlen(prop_name) + 1;
vd = *(u32 *)prop_data; vd = be32_to_cpu(*(__be32 *)prop_data);
prop_data += sizeof(vd); prop_data += sizeof(vd);
switch (vd) { switch (vd) {
@@ -212,13 +214,13 @@ static int update_dt_node(u32 phandle, s32 scope)
return 0; return 0;
} }
static int add_dt_node(u32 parent_phandle, u32 drc_index) static int add_dt_node(__be32 parent_phandle, __be32 drc_index)
{ {
struct device_node *dn; struct device_node *dn;
struct device_node *parent_dn; struct device_node *parent_dn;
int rc; int rc;
parent_dn = of_find_node_by_phandle(parent_phandle); parent_dn = of_find_node_by_phandle(be32_to_cpu(parent_phandle));
if (!parent_dn) if (!parent_dn)
return -ENOENT; return -ENOENT;
@@ -237,7 +239,7 @@ static int add_dt_node(u32 parent_phandle, u32 drc_index)
int pseries_devicetree_update(s32 scope) int pseries_devicetree_update(s32 scope)
{ {
char *rtas_buf; char *rtas_buf;
u32 *data; __be32 *data;
int update_nodes_token; int update_nodes_token;
int rc; int rc;
@@ -254,17 +256,17 @@ int pseries_devicetree_update(s32 scope)
if (rc && rc != 1) if (rc && rc != 1)
break; break;
data = (u32 *)rtas_buf + 4; data = (__be32 *)rtas_buf + 4;
while (*data & NODE_ACTION_MASK) { while (be32_to_cpu(*data) & NODE_ACTION_MASK) {
int i; int i;
u32 action = *data & NODE_ACTION_MASK; u32 action = be32_to_cpu(*data) & NODE_ACTION_MASK;
int node_count = *data & NODE_COUNT_MASK; u32 node_count = be32_to_cpu(*data) & NODE_COUNT_MASK;
data++; data++;
for (i = 0; i < node_count; i++) { for (i = 0; i < node_count; i++) {
u32 phandle = *data++; __be32 phandle = *data++;
u32 drc_index; __be32 drc_index;
switch (action) { switch (action) {
case DELETE_DT_NODE: case DELETE_DT_NODE: