summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorClaudiu Manoil2016-07-07 14:49:02 +0200
committerScott Wood2016-07-09 02:55:34 +0200
commit8ebf506ab2729012a3fe7dd8765a7d24202d409b (patch)
tree1307558e2dd44bf5eafb27e0916cc0e7a814f683 /arch/powerpc
parentpowerpc/pci: Assign fixed PHB number based on device-tree properties (diff)
downloadkernel-qcow2-linux-8ebf506ab2729012a3fe7dd8765a7d24202d409b.tar.gz
kernel-qcow2-linux-8ebf506ab2729012a3fe7dd8765a7d24202d409b.tar.xz
kernel-qcow2-linux-8ebf506ab2729012a3fe7dd8765a7d24202d409b.zip
powerpc/85xx: Don't report SRAM to L2 cache fallback as error
If the SRAM region parameters are missing the SRAM driver probing exits and the L2 region is configured as L2 cache entirely. This is the expected default behaviour, so it makes no sense to report it as an error. Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/sysdev/fsl_85xx_l2ctlr.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
index 861cebf9c292..c27058e5df26 100644
--- a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
+++ b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
@@ -90,12 +90,8 @@ static int mpc85xx_l2ctlr_of_probe(struct platform_device *dev)
}
l2cache_size = *prop;
- if (get_cache_sram_params(&sram_params)) {
- dev_err(&dev->dev,
- "Entire L2 as cache, provide valid sram offset and size\n");
- return -EINVAL;
- }
-
+ if (get_cache_sram_params(&sram_params))
+ return 0; /* fall back to L2 cache only */
rem = l2cache_size % sram_params.sram_size;
ways = LOCK_WAYS_FULL * sram_params.sram_size / l2cache_size;