Skip to content

powerpc: merge _switch in 32/64

Nicholas Piggin linuxppc-dev 2 versions – Applied

Status from this message: Applied to powerpc/next.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest6 patches 1 replyApplied
  2. v26 patches 2 repliesSuperseded

Changes in v3 from the cover letter

- Add PPC_CREATE_STACK_FRAME() to abstract prologue differences.
- Build fix.
- Makefile tidy [Christophe]
- Fix a missing SOB.

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/6powerpc/64s: move stack SLB pinning out of line from _switcharch/powerpc/kernel/entry_64.S+62 -510 replies
2/6powerpc/64: Rearrange 64-bit _switch to prepare for 32/64 mergearch/powerpc/kernel/entry_64.S+18 -200 replies
3/6powerpc/32: Remove sync from _switcharch/powerpc/kernel/entry_32.S+1 -70 replies
4/6powerpc/32: Rearrange _switch to prepare for 32/64 mergearch/powerpc/kernel/entry_32.S+5 -50 replies
5/6powerpc: merge 32-bit and 64-bit _switch implementationarch/powerpc/include/asm/ppc_asm.h arch/powerpc/kernel/Makefile arch/powerpc/kernel/entry_32.S +2 more+273 -2820 replies
6/6powerpc/64: Rename entry_64.S to prom_entry_64.Sarch/powerpc/kernel/Makefile arch/powerpc/kernel/prom_entry_64.S scripts/head-object-list.txt+10 -340 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 0/6] powerpc: merge _switch in 32/64

Since v2:
- Add PPC_CREATE_STACK_FRAME() to abstract prologue differences.
- Build fix.
- Makefile tidy [Christophe]
- Fix a missing SOB.

Since v1:
- Don't re-order 32-bit prologue.
- Improve Kconfig conditional includes.
- Break out code changes into their own patches before merging, so merge patch leaves generated code unchanged.
- Change prom_entry.S to prom_entry_64.S.

Nicholas Piggin (6):
powerpc/64s: move stack SLB pinning out of line from _switch powerpc/64: Rearrange 64-bit _switch to prepare for 32/64 merge powerpc/32: Remove sync from _switch
powerpc/32: Rearrange _switch to prepare for 32/64 merge
powerpc: merge 32-bit and 64-bit _switch implementation powerpc/64: Rename entry_64.S to prom_entry_64.S

 arch/powerpc/include/asm/ppc_asm.h           |  14 +
 arch/powerpc/kernel/Makefile                 |  14 +-
 arch/powerpc/kernel/entry_32.S               |  58 ----
 arch/powerpc/kernel/prom_entry_64.S          |  87 +++++
 arch/powerpc/kernel/{entry_64.S => switch.S} | 331 ++++++++-----------
 scripts/head-object-list.txt                 |   2 +-
 6 files changed, 238 insertions(+), 268 deletions(-)
 create mode 100644 arch/powerpc/kernel/prom_entry_64.S
 rename arch/powerpc/kernel/{entry_64.S => switch.S} (59%)
Signature · 1 line
2.40.1