ppc476: Enable a linker work around for IBM errata #46

This patch adds an option to enable a work around for an icache bug on
476 that can cause execution of stale instructions when falling
through pages (IBM errata #46). It requires a recent version of
binutils which supports the --ppc476-workaround option.

The work around enables the appropriate linker options and ensures
that all module output sections are aligned to 4K page boundaries. The
work around is only required when building modules.

Signed-off-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

3 files changed, 34 insertions, 0 deletions

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 4c0cedf4e2c7..31b96942c0a7 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -159,6 +159,11 @@ CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)
 
 KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
 
+ifeq ($(CONFIG_476FPE_ERR46),y)
+        KBUILD_LDFLAGS_MODULE += --ppc476-workaround \
+                -T $(srctree)/arch/powerpc/platforms/44x/ppc476_modules.lds
+endif
+
 # No AltiVec or VSX instructions when building kernel
 KBUILD_CFLAGS += $(call cc-option,-mno-altivec)
 KBUILD_CFLAGS += $(call cc-option,-mno-vsx)
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 8beec7d00cac..4d88f6a19058 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -351,6 +351,20 @@ config APM821xx
         select IBM_EMAC_EMAC4
         select IBM_EMAC_TAH
 
+config 476FPE_ERR46
+        depends on 476FPE
+        bool "Enable linker work around for PPC476FPE errata #46"
+        help
+          This option enables a work around for an icache bug on 476
+          that can cause execution of stale instructions when falling
+          through pages (IBM errata #46). It requires a recent version
+          of binutils which supports the --ppc476-workaround option.
+
+          The work around enables the appropriate linker options and
+          ensures that all module output sections are aligned to 4K
+          page boundaries. The work around is only required when
+          building modules.
+
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
         bool
diff --git a/arch/powerpc/platforms/44x/ppc476_modules.lds b/arch/powerpc/platforms/44x/ppc476_modules.lds
new file mode 100644
index 000000000000..9fec5d34ba8e
--- /dev/null
+++ b/arch/powerpc/platforms/44x/ppc476_modules.lds
@@ -0,0 +1,15 @@
+SECTIONS
+{
+        .text : ALIGN(4096)
+        {
+                *(.text .text.* .fixup)
+        }
+        .init.text : ALIGN(4096)
+        {
+                *(.init.text .init.text.*)
+        }
+        .exit.text : ALIGN(4096)
+        {
+                *(.exit.text .exit.text.*)
+        }
+}