Commit 3907ab26 authored by Timur Tabi's avatar Timur Tabi Committed by Kumar Gala

powerpc/85xx: add board support for the Freescale hypervisor

Add support for the ePAPR-compliant Freescale hypervisor (aka "Topaz") on
the Freescale P3041DS, P4080DS, and P5020DS reference boards.
Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent d173ea6b
...@@ -169,6 +169,7 @@ config P3041_DS ...@@ -169,6 +169,7 @@ config P3041_DS
select SWIOTLB select SWIOTLB
select MPC8xxx_GPIO select MPC8xxx_GPIO
select HAS_RAPIDIO select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
help help
This option enables support for the P3041 DS board This option enables support for the P3041 DS board
...@@ -180,6 +181,7 @@ config P4080_DS ...@@ -180,6 +181,7 @@ config P4080_DS
select SWIOTLB select SWIOTLB
select MPC8xxx_GPIO select MPC8xxx_GPIO
select HAS_RAPIDIO select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
help help
This option enables support for the P4080 DS board This option enables support for the P4080 DS board
...@@ -194,6 +196,7 @@ config P5020_DS ...@@ -194,6 +196,7 @@ config P5020_DS
select SWIOTLB select SWIOTLB
select MPC8xxx_GPIO select MPC8xxx_GPIO
select HAS_RAPIDIO select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
help help
This option enables support for the P5020 DS board This option enables support for the P5020 DS board
......
...@@ -120,6 +120,13 @@ static const struct of_device_id of_device_ids[] __devinitconst = { ...@@ -120,6 +120,13 @@ static const struct of_device_id of_device_ids[] __devinitconst = {
{ {
.compatible = "fsl,qoriq-pcie-v2.2", .compatible = "fsl,qoriq-pcie-v2.2",
}, },
/* The following two are for the Freescale hypervisor */
{
.name = "hypervisor",
},
{
.name = "handles",
},
{} {}
}; };
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <sysdev/fsl_soc.h> #include <sysdev/fsl_soc.h>
#include <sysdev/fsl_pci.h> #include <sysdev/fsl_pci.h>
#include <asm/ehv_pic.h>
#include "corenet_ds.h" #include "corenet_ds.h"
...@@ -40,7 +41,20 @@ static int __init p3041_ds_probe(void) ...@@ -40,7 +41,20 @@ static int __init p3041_ds_probe(void)
{ {
unsigned long root = of_get_flat_dt_root(); unsigned long root = of_get_flat_dt_root();
return of_flat_dt_is_compatible(root, "fsl,P3041DS"); if (of_flat_dt_is_compatible(root, "fsl,P3041DS"))
return 1;
/* Check if we're running under the Freescale hypervisor */
if (of_flat_dt_is_compatible(root, "fsl,P3041DS-hv")) {
ppc_md.init_IRQ = ehv_pic_init;
ppc_md.get_irq = ehv_pic_get_irq;
ppc_md.restart = fsl_hv_restart;
ppc_md.power_off = fsl_hv_halt;
ppc_md.halt = fsl_hv_halt;
return 1;
}
return 0;
} }
define_machine(p3041_ds) { define_machine(p3041_ds) {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <sysdev/fsl_soc.h> #include <sysdev/fsl_soc.h>
#include <sysdev/fsl_pci.h> #include <sysdev/fsl_pci.h>
#include <asm/ehv_pic.h>
#include "corenet_ds.h" #include "corenet_ds.h"
...@@ -39,7 +40,20 @@ static int __init p4080_ds_probe(void) ...@@ -39,7 +40,20 @@ static int __init p4080_ds_probe(void)
{ {
unsigned long root = of_get_flat_dt_root(); unsigned long root = of_get_flat_dt_root();
return of_flat_dt_is_compatible(root, "fsl,P4080DS"); if (of_flat_dt_is_compatible(root, "fsl,P4080DS"))
return 1;
/* Check if we're running under the Freescale hypervisor */
if (of_flat_dt_is_compatible(root, "fsl,P4080DS-hv")) {
ppc_md.init_IRQ = ehv_pic_init;
ppc_md.get_irq = ehv_pic_get_irq;
ppc_md.restart = fsl_hv_restart;
ppc_md.power_off = fsl_hv_halt;
ppc_md.halt = fsl_hv_halt;
return 1;
}
return 0;
} }
define_machine(p4080_ds) { define_machine(p4080_ds) {
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <sysdev/fsl_soc.h> #include <sysdev/fsl_soc.h>
#include <sysdev/fsl_pci.h> #include <sysdev/fsl_pci.h>
#include <asm/ehv_pic.h>
#include "corenet_ds.h" #include "corenet_ds.h"
...@@ -40,7 +41,20 @@ static int __init p5020_ds_probe(void) ...@@ -40,7 +41,20 @@ static int __init p5020_ds_probe(void)
{ {
unsigned long root = of_get_flat_dt_root(); unsigned long root = of_get_flat_dt_root();
return of_flat_dt_is_compatible(root, "fsl,P5020DS"); if (of_flat_dt_is_compatible(root, "fsl,P5020DS"))
return 1;
/* Check if we're running under the Freescale hypervisor */
if (of_flat_dt_is_compatible(root, "fsl,P5020DS-hv")) {
ppc_md.init_IRQ = ehv_pic_init;
ppc_md.get_irq = ehv_pic_get_irq;
ppc_md.restart = fsl_hv_restart;
ppc_md.power_off = fsl_hv_halt;
ppc_md.halt = fsl_hv_halt;
return 1;
}
return 0;
} }
define_machine(p5020_ds) { define_machine(p5020_ds) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment