x86/uv changes for v3.9
Subsystems (4)
Linus,
Please pull the latest x86-uv-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-uv-for-linus
HEAD: d924f947a44684796eee6fa488a9fe7876923c3b x86, uv, uv3: Trim MMR register definitions after code changes for SGI UV3
Support for the SGI Ultraviolet System 3 (UV3) platform - the upcoming third major iteration and upscaling of the SGI UV supercomputing platform.
out-of-topic modifications in x86-uv-for-linus:
-----------------------------------------------drivers/misc/sgi-gru/grufile.c # 385404e: x86, uv, uv3: Check current gru h
Thanks,
Ingo
------------------>
Mike Travis (7):
x86, uv, uv3: Update MMR register definitions for SGI Ultraviolet System 3 (UV3) x86, uv, uv3: Update ACPI Check to include SGI UV3
x86, uv, uv3: Update Hub Info for SGI UV3
x86, uv, uv3: Update x2apic Support for SGI UV3
x86, uv, uv3: Update Time Support for SGI UV3
x86, uv, uv3: Check current gru hub support for SGI UV3
x86, uv, uv3: Trim MMR register definitions after code changes for SGI UV3
arch/x86/include/asm/uv/uv_hub.h | 44 +- arch/x86/include/asm/uv/uv_mmrs.h | 1496 +++++++++++++++++++++++++++--------- arch/x86/kernel/apic/x2apic_uv_x.c | 206 ++++- arch/x86/pci/mmconfig-shared.c | 3 +- arch/x86/platform/uv/uv_time.c | 13 +- drivers/misc/sgi-gru/grufile.c | 2 +- 6 files changed, 1354 insertions(+), 410 deletions(-)
arch/x86/include/asm/uv/uv_hub.h +36 -8
@@ -5,7 +5,7 @@* * SGI UV architectural definitions * -* Copyright (C) 2007-2010 Silicon Graphics, Inc. All rights reserved. +* Copyright (C) 2007-2013 Silicon Graphics, Inc. All rights reserved. */ #ifndef _ASM_X86_UV_UV_HUB_H
@@ -175,6 +175,7 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);*/ #define UV1_HUB_REVISION_BASE 1#define UV2_HUB_REVISION_BASE 3 +#define UV3_HUB_REVISION_BASE 5static inline int is_uv1_hub (void ) {
@@ -183,6 +184,23 @@ static inline int is_uv1_hub(void)static inline int is_uv2_hub (void ) { +return ((uv_hub_info->hub_revision >=UV2_HUB_REVISION_BASE ) && + (uv_hub_info->hub_revision <UV3_HUB_REVISION_BASE )); +} + +static inline int is_uv3_hub (void ) +{ +return uv_hub_info->hub_revision >=UV3_HUB_REVISION_BASE ; +} + +static inline int is_uv_hub (void ) +{ +return uv_hub_info->hub_revision; +} + +/* code common to uv2 and uv3 only */ +static inline int is_uvx_hub (void ) +{return uv_hub_info->hub_revision >=UV2_HUB_REVISION_BASE ; }
@@ -230,14 +248,23 @@ union uvh_apicid {#define UV2_LOCAL_MMR_SIZE (32UL * 1024 * 1024)#define UV2_GLOBAL_MMR32_SIZE (32UL * 1024 * 1024) -#define UV_LOCAL_MMR_BASE (is_uv1_hub() ? UV1_LOCAL_MMR_BASE \ - : UV2_LOCAL_MMR_BASE) -#define UV_GLOBAL_MMR32_BASE (is_uv1_hub() ? UV1_GLOBAL_MMR32_BASE \ - : UV2_GLOBAL_MMR32_BASE) -#define UV_LOCAL_MMR_SIZE (is_uv1_hub() ? UV1_LOCAL_MMR_SIZE : \ - UV2_LOCAL_MMR_SIZE) +#define UV3_LOCAL_MMR_BASE 0xfa000000UL +#define UV3_GLOBAL_MMR32_BASE 0xfc000000UL +#define UV3_LOCAL_MMR_SIZE (32UL * 1024 * 1024) +#define UV3_GLOBAL_MMR32_SIZE (32UL * 1024 * 1024) + +#define UV_LOCAL_MMR_BASE (is_uv1_hub() ? UV1_LOCAL_MMR_BASE : \ + (is_uv2_hub() ? UV2_LOCAL_MMR_BASE : \ + UV3_LOCAL_MMR_BASE)) +#define UV_GLOBAL_MMR32_BASE (is_uv1_hub() ? UV1_GLOBAL_MMR32_BASE :\ + (is_uv2_hub() ? UV2_GLOBAL_MMR32_BASE :\ + UV3_GLOBAL_MMR32_BASE)) +#define UV_LOCAL_MMR_SIZE (is_uv1_hub() ? UV1_LOCAL_MMR_SIZE : \ + (is_uv2_hub() ? UV2_LOCAL_MMR_SIZE : \ + UV3_LOCAL_MMR_SIZE))#define UV_GLOBAL_MMR32_SIZE (is_uv1_hub() ? UV1_GLOBAL_MMR32_SIZE :\ - UV2_GLOBAL_MMR32_SIZE) + (is_uv2_hub() ? UV2_GLOBAL_MMR32_SIZE :\ + UV3_GLOBAL_MMR32_SIZE))#define UV_GLOBAL_MMR64_BASE (uv_hub_info->global_mmr_base)#define UV_GLOBAL_GRU_MMR_BASE 0x4000000
@@ -599,6 +626,7 @@ static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)* 1 - UV1 rev 1.0 initial silicon * 2 - UV1 rev 2.0 production silicon * 3 - UV2 rev 1.0 initial silicon +* 5 - UV3 rev 1.0 initial silicon */ static inline int uv_get_min_hub_revision_id (void ) {
arch/x86/include/asm/uv/uv_mmrs.h +1138 -358
2,104 lines not on this page · raw message
arch/x86/kernel/apic/x2apic_uv_x.c +171 -35
300 lines not on this page · raw message
arch/x86/pci/mmconfig-shared.c +1 -2
@@ -548,8 +548,7 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,if (cfg->address <0xFFFFFFFF )return 0 ; -if (!strcmp (mcfg->header.oem_id,"SGI" ) || - !strcmp (mcfg->header.oem_id,"SGI2" )) +if (!strncmp (mcfg->header.oem_id,"SGI" ,3 ))return 0 ;if (mcfg->header.revision >=1 ) {
arch/x86/platform/uv/uv_time.c +7 -6
@@ -15,7 +15,7 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * -* Copyright (c) 2009 Silicon Graphics, Inc. All Rights Reserved. +* Copyright (c) 2009-2013 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) Dimitri Sivanich */ #include <linux/clockchips.h>
@@ -102,9 +102,10 @@ static int uv_intr_pending(int pnode)if (is_uv1_hub ())return uv_read_global_mmr64 (pnode,UVH_EVENT_OCCURRED0 ) &UV1H_EVENT_OCCURRED0_RTC1_MASK ; -else -return uv_read_global_mmr64 (pnode,UV2H_EVENT_OCCURRED2 ) & -UV2H_EVENT_OCCURRED2_RTC_1_MASK ; +else if (is_uvx_hub ()) +return uv_read_global_mmr64 (pnode,UVXH_EVENT_OCCURRED2 ) & +UVXH_EVENT_OCCURRED2_RTC_1_MASK ; +return 0 ; }/* Setup interrupt and return non-zero if early expiration occurred. */
@@ -122,8 +123,8 @@ static int uv_setup_intr(int cpu, u64 expires)uv_write_global_mmr64 (pnode,UVH_EVENT_OCCURRED0_ALIAS ,UV1H_EVENT_OCCURRED0_RTC1_MASK ); else -uv_write_global_mmr64 (pnode ,UV2H_EVENT_OCCURRED2_ALIAS , -UV2H_EVENT_OCCURRED2_RTC_1_MASK ); +uv_write_global_mmr64 (pnode ,UVXH_EVENT_OCCURRED2_ALIAS , +UVXH_EVENT_OCCURRED2_RTC_1_MASK ); val = (X86_PLATFORM_IPI_VECTOR <<UVH_RTC1_INT_CONFIG_VECTOR_SHFT ) | ((u64 )apicid <<UVH_RTC1_INT_CONFIG_APIC_ID_SHFT );
drivers/misc/sgi-gru/grufile.c +1 -1
@@ -517,7 +517,7 @@ static int __init gru_init(void) {int ret; -if (!is_uv_system ()) +if (!is_uv_system () || (is_uvx_hub () && !is_uv2_hub ()))return 0 ;#if definedCONFIG_IA64