Skip to content

x86/platform/uv: Updates for UV5 Architecture

Mike Travis lkml platform-driver-x86 3 versions – Applied

Status from this message: The following commit has been merged into the x86/platform branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest13 patches 12 repliesApplied
  2. v313 patches 2 repliesSuperseded
  3. v112 patches 11 repliesSuperseded

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/13x86/platform/uv: Remove UV BAU TLB Shootdown Handlerarch/x86/include/asm/idtentry.h arch/x86/include/asm/uv/uv.h arch/x86/include/asm/uv/uv_bau.h +4 more+2 -28870 replies
2/13x86/platform/uv: Remove SCIR MMR references for UVY systems.arch/x86/include/asm/uv/uv_hub.h arch/x86/kernel/apic/x2apic_uv_x.c+3 -1223 replies
3/13x86/platform/uv: Adjust references in UV kernel modulesdrivers/misc/sgi-xp/xp.h drivers/misc/sgi-xp/xp_main.c drivers/misc/sgi-xp/xp_uv.c +3 more+15 -134 replies
4/13x86/platform/uv: Update UV MMRs for UV5arch/x86/include/asm/uv/uv_hub.h arch/x86/include/asm/uv/uv_mmrs.h arch/x86/kernel/apic/x2apic_uv_x.c +2 more+4278 -37070 replies
5/13x86/platform/uv: Add UV5 direct referencesarch/x86/include/asm/uv/uv_hub.h arch/x86/kernel/apic/x2apic_uv_x.c+103 -430 replies
6/13x86/platform/uv: Add and Decode Arch Type in UVsystabarch/x86/include/asm/uv/bios.h arch/x86/kernel/apic/x2apic_uv_x.c arch/x86/platform/uv/bios_uv.c+148 -305 replies
7/13x86/platform/uv: Update MMIOH references based on new UV5 MMRs.arch/x86/kernel/apic/x2apic_uv_x.c+144 -680 replies
8/13x86/platform/uv: Adjust GAM MMR references affected by UV5 updatesarch/x86/kernel/apic/x2apic_uv_x.c+25 -50 replies
9/13x86/platform/uv: Update UV5 MMR references in UV GRUarch/x86/kernel/apic/x2apic_uv_x.c+24 -60 replies
10/13x86/platform/uv: Update Node Present Countingarch/x86/kernel/apic/x2apic_uv_x.c+19 -70 replies
11/13x86/platform/uv: Update UV5 TSC Checkingarch/x86/include/asm/uv/uv_hub.h arch/x86/kernel/apic/x2apic_uv_x.c+11 -150 replies
12/13x86/platform/uv: Update for UV5 NMI MMR changesarch/x86/include/asm/uv/uv_hub.h arch/x86/platform/uv/uv_nmi.c+54 -230 replies
13/13x86/platform/uv: Update Copyrights to conform to HPE standardsarch/x86/include/asm/uv/bios.h arch/x86/include/asm/uv/uv_hub.h arch/x86/include/asm/uv/uv_mmrs.h +11 more+14 -00 replies

Reviews trailers per patch

12 of 13 patches have a Reviewed-by or Acked-by.

PatchDimitri SivanichSteve Wahl
1/13R-b
2/13R-b
3/13R-b R-b R-b R-b
4/13R-b
5/13R-b R-b
6/13R-b R-b
7/13R-b
8/13R-b R-b
9/13R-b R-b
10/13R-b R-b
11/13R-b
12/13R-b R-b
13/13

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/13] x86/platform/uv: Updates for UV5 Architecture

Changes included in this patch set:

* Add changes needed for new UV5 UV architecture. Chief among the changes are 52 bits of physical memory address and 57 bits of virtual address space.

* Remove the BAU TLB code cuurently being replaced by BAU APIC driver.

* Remove System Controller (monitoring) code

* Updated UV mmrs.h file removing UV1, adding UVY class, optimizing the arch selection of the MMR address/field, and trimming down MMR selection list reducing number of MMRs being defined.

* Process UV ArchType in UV BIOS generated UVsystab allowing OEMs to use OEM_ID for their own purposes.

* Update various mapping functions (MMIOH, MMR, GRU) to accommodate UV5 differences.

* Update node present counting for change in MMRs.

* Update TSC sync check of BIOS sync status.

* Update NMI handler for UV5 MMR changes.

* Update copyrights to conform to HPE standards.

This is version 4 with these changes since version 3:

* Fixed coding errors reported by kernel test robot <[email protected]>

- In [PATCH 04/13] x86/platform/uv: Update UV MMRs for UV5
Remove pnodeid return from early_get_pnodeid() as it was only used by UV1. Remove read node_id in uv_init_hub_info() as it was no longer relevant.

- In [PATCH v3 07/13] x86/platform/uv: Update MMIOH references based on new UV5 MMRs. Make calc_mmioh_map() a static function.

This is version 3 with these changes since version 2:

* Changes made to .gitconfig so no internal (unreachable) systems are referenced.

This is version 2 with these changes since version 1:

* Added diffstats to p-intro.

* Updated Copyrights to be in one file and only include the year the code was modified.

* Updated to use git format-patch to construct patch email and git send-email to send the patches.

Mike Travis (13):
x86/platform/uv: Remove UV BAU TLB Shootdown Handler x86/platform/uv: Remove SCIR MMR references for UVY systems. x86/platform/uv: Adjust references in UV kernel modules x86/platform/uv: Update UV MMRs for UV5 x86/platform/uv: Add UV5 direct references x86/platform/uv: Add and Decode Arch Type in UVsystab x86/platform/uv: Update MMIOH references based on new UV5 MMRs. x86/platform/uv: Adjust GAM MMR references affected by UV5 updates x86/platform/uv: Update UV5 MMR references in UV GRU x86/platform/uv: Update Node Present Counting x86/platform/uv: Update UV5 TSC Checking x86/platform/uv: Update for UV5 NMI MMR changes x86/platform/uv: Update Copyrights to conform to HPE standards

 arch/x86/include/asm/idtentry.h     |    4 -
 arch/x86/include/asm/uv/bios.h      |   17 +-
 arch/x86/include/asm/uv/uv.h        |    4 +-
 arch/x86/include/asm/uv/uv_bau.h    |  755 ---
 arch/x86/include/asm/uv/uv_hub.h    |  165 +-
 arch/x86/include/asm/uv/uv_mmrs.h   | 7646 ++++++++++++++-------------
 arch/x86/kernel/apic/x2apic_uv_x.c  |  822 +--
 arch/x86/kernel/idt.c               |    3 -
 arch/x86/mm/tlb.c                   |   24 -
 arch/x86/platform/uv/Makefile       |    2 +-
 arch/x86/platform/uv/bios_uv.c      |   28 +-
 arch/x86/platform/uv/tlb_uv.c       | 2097 --------
 arch/x86/platform/uv/uv_nmi.c       |   65 +-
 arch/x86/platform/uv/uv_time.c      |   11 +-
 drivers/misc/sgi-gru/grufile.c      |    3 +-
 drivers/misc/sgi-xp/xp.h            |    9 +-
 drivers/misc/sgi-xp/xp_main.c       |    5 +-
 drivers/misc/sgi-xp/xp_uv.c         |    7 +-
 drivers/misc/sgi-xp/xpc_main.c      |    7 +-
 drivers/misc/sgi-xp/xpc_partition.c |    3 +-
 drivers/misc/sgi-xp/xpnet.c         |    3 +-
 21 files changed, 4797 insertions(+), 6883 deletions(-)
 delete mode 100644 arch/x86/include/asm/uv/uv_bau.h
 delete mode 100644 arch/x86/platform/uv/tlb_uv.c
Signature · 1 line
2.21.0