diff options
| author | Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 2007-12-04 19:38:24 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-11 13:34:40 +1100 |
| commit | 9858ee8ac52117cb38d7ef79b4db3382ea465a2a (patch) | |
| tree | 008593333b2430af6398f7ec16f7f58b9e70d3d5 /arch/powerpc/platforms/cell/iommu.c | |
| parent | c7a3f93d00726b9c51b2517ddfa4767422e9e631 (diff) | |
| download | lwn-9858ee8ac52117cb38d7ef79b4db3382ea465a2a.tar.gz lwn-9858ee8ac52117cb38d7ef79b4db3382ea465a2a.zip | |
[POWERPC] celleb: Add support for native CBE
This adds support for native CBE on Celleb, that is, without the BEAT
hypervisor. Many codes in platforms/cell/ are used in native CBE
environment.
Signed-off-by: Kou Ishizaki <Kou.Ishizaki@toshiba.co.jp>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/cell/iommu.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index faabc3fdc130..b465494cc24c 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c @@ -34,6 +34,7 @@ #include <asm/udbg.h> #include <asm/of_platform.h> #include <asm/lmb.h> +#include <asm/firmware.h> #include <asm/cell-regs.h> #include "interrupt.h" @@ -699,7 +700,8 @@ static int __init cell_iommu_init(void) { struct device_node *np; - if (!machine_is(cell)) + if ((!machine_is(cell) && !machine_is(celleb)) || + firmware_has_feature(FW_FEATURE_LPAR)) return -ENODEV; /* If IOMMU is disabled or we have little enough RAM to not need |