* [RFC PATCH] powerpc: allow allyesconfig to build more
@ 2014-02-27 6:17 Stephen Rothwell
2014-02-28 4:06 ` Michael Neuling
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2014-02-27 6:17 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Mahesh Salgaonkar, Michael Neuling, ppc-dev, paulus
[-- Attachment #1: Type: text/plain, Size: 2215 bytes --]
Fixes this build error:
arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
arch/powerpc/kernel/exceptions-64s.S:1312: Error: attempt to move .org backwards
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/exceptions-64s.S | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
This builds allyesconfig better (we still have RELOC failures in the
link) and hopefully fixes the allmodconfig build, but I don't know if
it is semantically OK.
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 38d507306a11..b87859ffc8e7 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1294,16 +1294,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
.globl __end_handlers
__end_handlers:
- /* Equivalents to the above handlers for relocation-on interrupt vectors */
- STD_RELON_EXCEPTION_HV_OOL(0xe40, emulation_assist)
- MASKABLE_RELON_EXCEPTION_HV_OOL(0xe80, h_doorbell)
-
- STD_RELON_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor)
- STD_RELON_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable)
- STD_RELON_EXCEPTION_PSERIES_OOL(0xf40, vsx_unavailable)
- STD_RELON_EXCEPTION_PSERIES_OOL(0xf60, facility_unavailable)
- STD_RELON_EXCEPTION_HV_OOL(0xf80, hv_facility_unavailable)
-
#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV)
/*
* Data area reserved for FWNMI option.
@@ -1325,6 +1315,16 @@ fwnmi_data_area:
initial_stab:
.space 4096
+ /* Equivalents to the above handlers for relocation-on interrupt vectors */
+ STD_RELON_EXCEPTION_HV_OOL(0xe40, emulation_assist)
+ MASKABLE_RELON_EXCEPTION_HV_OOL(0xe80, h_doorbell)
+
+ STD_RELON_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor)
+ STD_RELON_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable)
+ STD_RELON_EXCEPTION_PSERIES_OOL(0xf40, vsx_unavailable)
+ STD_RELON_EXCEPTION_PSERIES_OOL(0xf60, facility_unavailable)
+ STD_RELON_EXCEPTION_HV_OOL(0xf80, hv_facility_unavailable)
+
#ifdef CONFIG_PPC_POWERNV
_GLOBAL(opal_mc_secondary_handler)
HMT_MEDIUM_PPR_DISCARD
--
1.9.0
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RFC PATCH] powerpc: allow allyesconfig to build more
2014-02-27 6:17 [RFC PATCH] powerpc: allow allyesconfig to build more Stephen Rothwell
@ 2014-02-28 4:06 ` Michael Neuling
2014-02-28 7:46 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 3+ messages in thread
From: Michael Neuling @ 2014-02-28 4:06 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: ppc-dev, paulus, Mahesh Salgaonkar
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Fixes this build error:
>
> arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
> arch/powerpc/kernel/exceptions-64s.S:1312: Error: attempt to move .org backwards
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Builds and boots for me
Acked-off-by: Michael Neuling <mikey@neuling.org>
> ---
> arch/powerpc/kernel/exceptions-64s.S | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> This builds allyesconfig better (we still have RELOC failures in the
> link) and hopefully fixes the allmodconfig build, but I don't know if
> it is semantically OK.
>
> diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
> index 38d507306a11..b87859ffc8e7 100644
> --- a/arch/powerpc/kernel/exceptions-64s.S
> +++ b/arch/powerpc/kernel/exceptions-64s.S
> @@ -1294,16 +1294,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
> .globl __end_handlers
> __end_handlers:
>
> - /* Equivalents to the above handlers for relocation-on interrupt vectors */
> - STD_RELON_EXCEPTION_HV_OOL(0xe40, emulation_assist)
> - MASKABLE_RELON_EXCEPTION_HV_OOL(0xe80, h_doorbell)
> -
> - STD_RELON_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor)
> - STD_RELON_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable)
> - STD_RELON_EXCEPTION_PSERIES_OOL(0xf40, vsx_unavailable)
> - STD_RELON_EXCEPTION_PSERIES_OOL(0xf60, facility_unavailable)
> - STD_RELON_EXCEPTION_HV_OOL(0xf80, hv_facility_unavailable)
> -
> #if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV)
> /*
> * Data area reserved for FWNMI option.
> @@ -1325,6 +1315,16 @@ fwnmi_data_area:
> initial_stab:
> .space 4096
>
> + /* Equivalents to the above handlers for relocation-on interrupt vectors */
> + STD_RELON_EXCEPTION_HV_OOL(0xe40, emulation_assist)
> + MASKABLE_RELON_EXCEPTION_HV_OOL(0xe80, h_doorbell)
> +
> + STD_RELON_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor)
> + STD_RELON_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable)
> + STD_RELON_EXCEPTION_PSERIES_OOL(0xf40, vsx_unavailable)
> + STD_RELON_EXCEPTION_PSERIES_OOL(0xf60, facility_unavailable)
> + STD_RELON_EXCEPTION_HV_OOL(0xf80, hv_facility_unavailable)
> +
> #ifdef CONFIG_PPC_POWERNV
> _GLOBAL(opal_mc_secondary_handler)
> HMT_MEDIUM_PPR_DISCARD
> --
> 1.9.0
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC PATCH] powerpc: allow allyesconfig to build more
2014-02-28 4:06 ` Michael Neuling
@ 2014-02-28 7:46 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2014-02-28 7:46 UTC (permalink / raw)
To: Michael Neuling; +Cc: Stephen Rothwell, ppc-dev, paulus, Mahesh Salgaonkar
On Fri, 2014-02-28 at 15:06 +1100, Michael Neuling wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Fixes this build error:
> >
> > arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
> > arch/powerpc/kernel/exceptions-64s.S:1312: Error: attempt to move .org backwards
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Builds and boots for me
>
> Acked-off-by: Michael Neuling <mikey@neuling.org>
>
And breaks at least one of my configs (the g5 one) with a relocation
problem in head_64.o (which is why I had modified the original patch to
be less aggressive iirc).
We end up moving things too far away from a conditional branch, I
think the masked_*interrupt stuff. We need to shuffle things a bit
more to get that to work.
Cheers,
Ben.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-28 7:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-27 6:17 [RFC PATCH] powerpc: allow allyesconfig to build more Stephen Rothwell
2014-02-28 4:06 ` Michael Neuling
2014-02-28 7:46 ` Benjamin Herrenschmidt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.