Skip to content

Commit

Permalink
powerpc/mpc85xx: refactor the PM operations
Browse files Browse the repository at this point in the history 
Freescale CoreNet-based and Non-CoreNet-based platforms require
different PM operations. This patch extracted existing PM operations
on Non-CoreNet-based platforms to a new file which can accommodate
both platforms. In this way, PM operation codes are clearer structurally.

Signed-off-by: Chenhui Zhao <chenhui.zhao@freescale.com>
Signed-off-by: Tang Yuantian <Yuantian.Tang@feescale.com>
Signed-off-by: Scott Wood <oss@buserror.net>
  • Loading branch information
chenhui zhao authored and Scott Wood committed Mar 5, 2016
1 parent d17799f commit 56f1ba2
Show file tree
Hide file tree
Showing 4 changed files with 127 additions and 54 deletions.
1 change: 1 addition & 0 deletions arch/powerpc/platforms/85xx/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Makefile for the PowerPC 85xx linux kernel.
#
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_FSL_PMC) += mpc85xx_pm_ops.o

obj-y += common.o

Expand Down
106 changes: 106 additions & 0 deletions arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
/*
* MPC85xx PM operators
*
* Copyright 2015 Freescale Semiconductor Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/

#define pr_fmt(fmt) "%s: " fmt, __func__

#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/fsl/guts.h>

#include <asm/io.h>
#include <asm/fsl_pm.h>

static struct ccsr_guts __iomem *guts;

static void mpc85xx_irq_mask(int cpu)
{

}

static void mpc85xx_irq_unmask(int cpu)
{

}

static void mpc85xx_cpu_die(int cpu)
{
u32 tmp;

tmp = (mfspr(SPRN_HID0) & ~(HID0_DOZE|HID0_SLEEP)) | HID0_NAP;
mtspr(SPRN_HID0, tmp);

/* Enter NAP mode. */
tmp = mfmsr();
tmp |= MSR_WE;
asm volatile(
"msync\n"
"mtmsr %0\n"
"isync\n"
:
: "r" (tmp));
}

static void mpc85xx_cpu_up_prepare(int cpu)
{

}

static void mpc85xx_freeze_time_base(bool freeze)
{
uint32_t mask;

mask = CCSR_GUTS_DEVDISR_TB0 | CCSR_GUTS_DEVDISR_TB1;
if (freeze)
setbits32(&guts->devdisr, mask);
else
clrbits32(&guts->devdisr, mask);

in_be32(&guts->devdisr);
}

static const struct of_device_id mpc85xx_smp_guts_ids[] = {
{ .compatible = "fsl,mpc8572-guts", },
{ .compatible = "fsl,p1020-guts", },
{ .compatible = "fsl,p1021-guts", },
{ .compatible = "fsl,p1022-guts", },
{ .compatible = "fsl,p1023-guts", },
{ .compatible = "fsl,p2020-guts", },
{ .compatible = "fsl,bsc9132-guts", },
{},
};

static const struct fsl_pm_ops mpc85xx_pm_ops = {
.freeze_time_base = mpc85xx_freeze_time_base,
.irq_mask = mpc85xx_irq_mask,
.irq_unmask = mpc85xx_irq_unmask,
.cpu_die = mpc85xx_cpu_die,
.cpu_up_prepare = mpc85xx_cpu_up_prepare,
};

int __init mpc85xx_setup_pmc(void)
{
struct device_node *np;

np = of_find_matching_node(NULL, mpc85xx_smp_guts_ids);
if (np) {
guts = of_iomap(np, 0);
of_node_put(np);
if (!guts) {
pr_err("Could not map guts node address\n");
return -ENOMEM;
}
}

qoriq_pm_ops = &mpc85xx_pm_ops;

return 0;
}
73 changes: 19 additions & 54 deletions arch/powerpc/platforms/85xx/smp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Author: Andy Fleming <afleming@freescale.com>
* Kumar Gala <galak@kernel.crashing.org>
*
* Copyright 2006-2008, 2011-2012 Freescale Semiconductor Inc.
* Copyright 2006-2008, 2011-2012, 2015 Freescale Semiconductor Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
Expand All @@ -15,7 +15,6 @@
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/kexec.h>
#include <linux/highmem.h>
#include <linux/cpu.h>
Expand All @@ -29,6 +28,7 @@
#include <asm/dbell.h>
#include <asm/code-patching.h>
#include <asm/cputhreads.h>
#include <asm/fsl_pm.h>

#include <sysdev/fsl_soc.h>
#include <sysdev/mpic.h>
Expand All @@ -43,24 +43,11 @@ struct epapr_spin_table {
u32 pir;
};

static struct ccsr_guts __iomem *guts;
#ifdef CONFIG_HOTPLUG_CPU
static u64 timebase;
static int tb_req;
static int tb_valid;

static void mpc85xx_timebase_freeze(int freeze)
{
uint32_t mask;

mask = CCSR_GUTS_DEVDISR_TB0 | CCSR_GUTS_DEVDISR_TB1;
if (freeze)
setbits32(&guts->devdisr, mask);
else
clrbits32(&guts->devdisr, mask);

in_be32(&guts->devdisr);
}

static void mpc85xx_give_timebase(void)
{
unsigned long flags;
Expand All @@ -71,7 +58,7 @@ static void mpc85xx_give_timebase(void)
barrier();
tb_req = 0;

mpc85xx_timebase_freeze(1);
qoriq_pm_ops->freeze_time_base(true);
#ifdef CONFIG_PPC64
/*
* e5500/e6500 have a workaround for erratum A-006958 in place
Expand Down Expand Up @@ -104,7 +91,7 @@ static void mpc85xx_give_timebase(void)
while (tb_valid)
barrier();

mpc85xx_timebase_freeze(0);
qoriq_pm_ops->freeze_time_base(false);

local_irq_restore(flags);
}
Expand All @@ -126,31 +113,25 @@ static void mpc85xx_take_timebase(void)
local_irq_restore(flags);
}

#ifdef CONFIG_HOTPLUG_CPU
static void smp_85xx_mach_cpu_die(void)
{
unsigned int cpu = smp_processor_id();
u32 tmp;

local_irq_disable();
hard_irq_disable();
/* mask all irqs to prevent cpu wakeup */
qoriq_pm_ops->irq_mask(cpu);

idle_task_exit();
generic_set_cpu_dead(cpu);
mb();

mtspr(SPRN_TCR, 0);
mtspr(SPRN_TSR, mfspr(SPRN_TSR));

cur_cpu_spec->cpu_down_flush();
generic_set_cpu_dead(cpu);

tmp = (mfspr(SPRN_HID0) & ~(HID0_DOZE|HID0_SLEEP)) | HID0_NAP;
mtspr(SPRN_HID0, tmp);
isync();
cur_cpu_spec->cpu_down_flush();

/* Enter NAP mode. */
tmp = mfmsr();
tmp |= MSR_WE;
mb();
mtmsr(tmp);
isync();
qoriq_pm_ops->cpu_die(cpu);

while (1)
;
Expand Down Expand Up @@ -468,16 +449,6 @@ static void smp_85xx_setup_cpu(int cpu_nr)
smp_85xx_basic_setup(cpu_nr);
}

static const struct of_device_id mpc85xx_smp_guts_ids[] = {
{ .compatible = "fsl,mpc8572-guts", },
{ .compatible = "fsl,p1020-guts", },
{ .compatible = "fsl,p1021-guts", },
{ .compatible = "fsl,p1022-guts", },
{ .compatible = "fsl,p1023-guts", },
{ .compatible = "fsl,p2020-guts", },
{},
};

void __init mpc85xx_smp_init(void)
{
struct device_node *np;
Expand All @@ -501,22 +472,16 @@ void __init mpc85xx_smp_init(void)
smp_85xx_ops.probe = NULL;
}

np = of_find_matching_node(NULL, mpc85xx_smp_guts_ids);
if (np) {
guts = of_iomap(np, 0);
of_node_put(np);
if (!guts) {
pr_err("%s: Could not map guts node address\n",
__func__);
return;
}
#ifdef CONFIG_HOTPLUG_CPU
#ifdef CONFIG_FSL_PMC
mpc85xx_setup_pmc();
#endif
if (qoriq_pm_ops) {
smp_85xx_ops.give_timebase = mpc85xx_give_timebase;
smp_85xx_ops.take_timebase = mpc85xx_take_timebase;
#ifdef CONFIG_HOTPLUG_CPU
ppc_md.cpu_die = smp_85xx_mach_cpu_die;
#endif
}

#endif
smp_ops = &smp_85xx_ops;

#ifdef CONFIG_KEXEC
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/85xx/smp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#ifdef CONFIG_SMP
void __init mpc85xx_smp_init(void);
int __init mpc85xx_setup_pmc(void);
#else
static inline void mpc85xx_smp_init(void)
{
Expand Down

0 comments on commit 56f1ba2

Please sign in to comment.