Skip to content

convert voyager over to the x86 quirks model

James Bottomley lkml 1 version In review

Get series with b4
b4 am 1236530906-7175-1-git-send-email-James.Bottomley@HansenPartnership.com

Versions newest first

  1. v1 Latest13 patches 10 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13x86: add {safe,hard}_smp_processor_id to smp_opsarch/x86/include/asm/smp.h arch/x86/kernel/apic/apic.c arch/x86/kernel/apic/ipi.c +2 more+26 -82 replies
2/13x86/mca: make mca_nmi_hook externalarch/x86/include/asm/mca.h arch/x86/kernel/mca_32.c+15 -00 replies
3/13x86: add prefill_possible_map to x86_quirksarch/x86/include/asm/setup.h arch/x86/kernel/setup.c+5 -10 replies
4/13x86: use boot_cpu_id instead of zero for checking boot processorarch/x86/kernel/smpboot.c+1 -10 replies
5/13x86/voyager: Move voyager detection to a new bootparam areaarch/x86/boot/Makefile arch/x86/boot/a20.c arch/x86/boot/boot.h +7 more+72 -240 replies
6/13x86: eliminate subarchitecture file setup_arch.harch/x86/include/asm/mach-voyager/setup_arch.h arch/x86/include/asm/setup_arch.h arch/x86/kernel/probe_roms_32.c +1 more+0 -230 replies
7/13x86: eliminate subarchitecture file entry_arch.harch/x86/include/asm/entry_arch.h arch/x86/include/asm/hw_irq.h arch/x86/include/asm/mach-voyager/entry_arch.h +3 more+117 -1180 replies
8/13x86: eliminate subarchitecture file do_timer.harch/x86/include/asm/do_timer.h arch/x86/include/asm/mach-voyager/do_timer.h arch/x86/include/asm/voyager.h +2 more+24 -370 replies
9/13x86: redo irq2 cascade setuparch/x86/include/asm/setup.h arch/x86/kernel/irqinit_32.c arch/x86/kernel/setup.c +2 more+9 -420 replies
10/13x86: make disabling the apics functional instead of a flagarch/x86/include/asm/apic.h arch/x86/kernel/apic/apic.c arch/x86/kernel/apic/probe_32.c +1 more+13 -30 replies
11/13x86/Voyager: add missing QIC call function single gatearch/x86/mach-voyager/voyager_smp.c+2 -00 replies
12/13x86/Voyager: replace inline io area reads with readX accessorsarch/x86/mach-voyager/voyager_smp.c+6 -160 replies
13/13x86/Voyager: Plumb voyager back into the buildarch/x86/Kconfig arch/x86/Makefile arch/x86/include/asm/voyager.h +5 more+262 -4420 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH 00/13] convert voyager over to the x86 quirks model

Given the lack of feedback, I went ahead and implemented the additions to smp_ops and x86_quirks (and a dynamic mca NMI hook) to allow voyager to be plumbed in.

There also needs to be changes in the boot setup to make voyager work
dynamically: It has to be detected first, so the a20 gate check is only executed if a voyager is not found.

I also completed some of the subarchitecture eliminations, so all the include file infrastructure should be gone.

The result is that I can boot both my PC SMP x86 boxes and voyager with the same kernel.

This patch series applies on the x86/apic branch of the x86 tree (obviously with 965c7ecaf2e2b083d711a01ab33735a4bdeee1a4 reverted)

James

---

[VOYAGER] x86: add {safe,hard}_smp_processor_id to smp_ops [VOYAGER] x86/mca: make mca_nmi_hook external
[VOYAGER] x86: add prefill_possible_map to x86_quirks [VOYAGER] x86: use boot_cpu_id instead of zero for checking boot
processor
[VOYAGER] x86/voyager: Move voyager detection to a new bootparam area [VOYAGER] x86: eliminate subarchitecture file setup_arch.h [VOYAGER] x86: eliminate subarchitecture file entry_arch.h [VOYAGER] x86: eliminate subarchitecture file do_timer.h [VOYAGER] x86: redo irq2 cascade setup
[VOYAGER] x86: make disabling the apics functional instead of a flag [VOYAGER] x86/Voyager: add missing QIC call function single gate [VOYAGER] x86/Voyager: replace inline io area reads with readX
accessors
[VOYAGER] x86/Voyager: Plumb voyager back into the build

 arch/x86/Kconfig                               |    4 +-
 arch/x86/Makefile                              |    2 +
 arch/x86/boot/Makefile                         |    4 +-
 arch/x86/boot/a20.c                            |   13 +-
 arch/x86/boot/boot.h                           |    2 +-
 arch/x86/boot/voyager.c                        |    5 +-
 arch/x86/include/asm/apic.h                    |    6 +
 arch/x86/include/asm/bootparam.h               |    5 +-
 arch/x86/include/asm/do_timer.h                |   16 -
 arch/x86/include/asm/entry_arch.h              |   57 ---
 arch/x86/include/asm/hw_irq.h                  |   11 +
 arch/x86/include/asm/mach-voyager/do_timer.h   |   17 -
 arch/x86/include/asm/mach-voyager/entry_arch.h |   26 --
 arch/x86/include/asm/mach-voyager/setup_arch.h |   12 -
 arch/x86/include/asm/mca.h                     |    3 +
 arch/x86/include/asm/setup.h                   |    6 +-
 arch/x86/include/asm/setup_arch.h              |    3 -
 arch/x86/include/asm/smp.h                     |   13 +-
 arch/x86/include/asm/voyager.h                 |   80 ++---
 arch/x86/include/asm/voyager_bios.h            |   21 +
 arch/x86/include/asm/voyager_boot.h            |   27 ++
 arch/x86/include/asm/voyager_vectors.h         |   37 ++
 arch/x86/kernel/apic/apic.c                    |    8 +-
 arch/x86/kernel/apic/ipi.c                     |    2 +-
 arch/x86/kernel/apic/probe_32.c                |    3 +
 arch/x86/kernel/entry_32.S                     |   70 +++-
 arch/x86/kernel/irqinit_32.c                   |   15 +-
 arch/x86/kernel/mca_32.c                       |   12 +
 arch/x86/kernel/probe_roms_32.c                |    1 -
 arch/x86/kernel/setup.c                        |   35 +--
 arch/x86/kernel/smp.c                          |    7 +
 arch/x86/kernel/smpboot.c                      |    2 +-
 arch/x86/kernel/time_32.c                      |   11 +-
 arch/x86/kernel/visws_quirks.c                 |    7 -
 arch/x86/mach-voyager/setup.c                  |   66 ++--
 arch/x86/mach-voyager/voyager_basic.c          |   98 ++---
 arch/x86/mach-voyager/voyager_smp.c            |  544 ++++++++----------------
 arch/x86/mach-voyager/voyager_thread.c         |    5 +-
 arch/x86/xen/smp.c                             |    7 +
 39 files changed, 550 insertions(+), 713 deletions(-)
 delete mode 100644 arch/x86/include/asm/do_timer.h
 delete mode 100644 arch/x86/include/asm/entry_arch.h
 delete mode 100644 arch/x86/include/asm/mach-voyager/do_timer.h
 delete mode 100644 arch/x86/include/asm/mach-voyager/entry_arch.h
 delete mode 100644 arch/x86/include/asm/mach-voyager/setup_arch.h
 delete mode 100644 arch/x86/include/asm/setup_arch.h
 create mode 100644 arch/x86/include/asm/voyager_bios.h
 create mode 100644 arch/x86/include/asm/voyager_boot.h
 create mode 100644 arch/x86/include/asm/voyager_vectors.h