diff options
author | Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 2007-12-04 03:38:24 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-10 21:34:40 -0500 |
commit | 9858ee8ac52117cb38d7ef79b4db3382ea465a2a (patch) | |
tree | 008593333b2430af6398f7ec16f7f58b9e70d3d5 /arch/powerpc/platforms/cell/iommu.c | |
parent | c7a3f93d00726b9c51b2517ddfa4767422e9e631 (diff) |
[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 faabc3fdc13..b465494cc24 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <asm/udbg.h> | 34 | #include <asm/udbg.h> |
35 | #include <asm/of_platform.h> | 35 | #include <asm/of_platform.h> |
36 | #include <asm/lmb.h> | 36 | #include <asm/lmb.h> |
37 | #include <asm/firmware.h> | ||
37 | #include <asm/cell-regs.h> | 38 | #include <asm/cell-regs.h> |
38 | 39 | ||
39 | #include "interrupt.h" | 40 | #include "interrupt.h" |
@@ -699,7 +700,8 @@ static int __init cell_iommu_init(void) | |||
699 | { | 700 | { |
700 | struct device_node *np; | 701 | struct device_node *np; |
701 | 702 | ||
702 | if (!machine_is(cell)) | 703 | if ((!machine_is(cell) && !machine_is(celleb)) || |
704 | firmware_has_feature(FW_FEATURE_LPAR)) | ||
703 | return -ENODEV; | 705 | return -ENODEV; |
704 | 706 | ||
705 | /* If IOMMU is disabled or we have little enough RAM to not need | 707 | /* If IOMMU is disabled or we have little enough RAM to not need |