From nobody Tue Jun 23 09:11:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7AE8BC433FE for ; Tue, 8 Mar 2022 01:06:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344175AbiCHBHY (ORCPT ); Mon, 7 Mar 2022 20:07:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231173AbiCHBHR (ORCPT ); Mon, 7 Mar 2022 20:07:17 -0500 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E878430F5E; Mon, 7 Mar 2022 17:06:21 -0800 (PST) Received: from pps.filterd (m0134425.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 227NHeiv008676; Tue, 8 Mar 2022 01:05:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=z9ljuQb1bGjLceb2+CmKlwOgYsd7hWDTy5Iu5bfRm+M=; b=Yv4n9sPi9qFYICgjBOME0DR4Hk0RDW8SWT6TRe/29tPEU54+0TSbBLhPSdW3U2oWOxvC UhH2dsxU4T/15d2Bf4b7Pi80yVxJqsXYW7r/g+qAZn5zfTl+WmcObQxPb5k3ejCDtSHu snK9oBeY+D/QdLJS0CNWuFnuSadMvzaJbk4mdWGupbFZuj8IbtS7amXaS4y7ygJ3KBCC eHPENPFdVRLG/zCmZpdRtRHNselUZ59kNz7TiaBmOsqRVJJ4MX4/bf/dB2naHZYpGtjq cn3jgL8R+xkiqkGqdZgDjXicPfju79T0L2eDu85gi+CouTnMNTDVe1qvxkl8KTjl+3TE Lg== Received: from g4t3425.houston.hpe.com (g4t3425.houston.hpe.com [15.241.140.78]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3enu2yrw1j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Mar 2022 01:05:50 +0000 Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g4t3425.houston.hpe.com (Postfix) with ESMTP id A977BAF; Tue, 8 Mar 2022 01:05:49 +0000 (UTC) Received: from dog.eag.rdlabs.hpecorp.net (dog.eag.rdlabs.hpecorp.net [128.162.243.181]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 977EC60; Tue, 8 Mar 2022 01:05:48 +0000 (UTC) From: Mike Travis To: Borislav Petkov , Ingo Molnar , Thomas Gleixner , Steve Wahl , x86@kernel.org Cc: Mike Travis , Andy Shevchenko , Darren Hart , Dimitri Sivanich , "H. Peter Anvin" , Russ Anderson , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 1/4] x86/platform/uv: Remove Obsolete Scratch5 NMI handler Date: Mon, 7 Mar 2022 19:05:34 -0600 Message-Id: <20220308010537.70150-2-mike.travis@hpe.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220308010537.70150-1-mike.travis@hpe.com> References: <20220308010537.70150-1-mike.travis@hpe.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: OMJDI3ASZF6Mmzu497SKdfDBPYnz7uEN X-Proofpoint-ORIG-GUID: OMJDI3ASZF6Mmzu497SKdfDBPYnz7uEN X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-07_12,2022-03-04_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 spamscore=0 suspectscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 mlxscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203080000 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Removes obsolete scratch5 NMI handler only used in UV1 and early UV2 systems. Signed-off-by: Mike Travis Reviewed-by: Steve Wahl --- arch/x86/include/asm/uv/uv_hub.h | 6 ------ arch/x86/platform/uv/uv_nmi.c | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_= hub.h index d3e3197917be..958c18f94146 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h @@ -729,12 +729,6 @@ extern void uv_nmi_setup_hubless(void); #define UVH_TSC_SYNC_VALID 3 /* 0011 */ #define UVH_TSC_SYNC_UNKNOWN 0 /* 0000 */ =20 -/* BMC sets a bit this MMR non-zero before sending an NMI */ -#define UVH_NMI_MMR UVH_BIOS_KERNEL_MMR -#define UVH_NMI_MMR_CLEAR UVH_BIOS_KERNEL_MMR_ALIAS -#define UVH_NMI_MMR_SHIFT 63 -#define UVH_NMI_MMR_TYPE "SCRATCH5" - struct uv_hub_nmi_s { raw_spinlock_t nmi_lock; atomic_t in_nmi; /* flag this node in UV NMI IRQ */ diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index 1e9ff28bc2e0..926a4e006e5a 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -280,10 +280,7 @@ static void uv_nmi_setup_mmrs(void) nmi_mmr_pending =3D 1UL << uvh_nmi_mmrx_shift; pr_info("UV: SMI NMI support: %s\n", uvh_nmi_mmrx_type); } else { - nmi_mmr =3D UVH_NMI_MMR; - nmi_mmr_clear =3D UVH_NMI_MMR_CLEAR; - nmi_mmr_pending =3D 1UL << UVH_NMI_MMR_SHIFT; - pr_info("UV: SMI NMI support: %s\n", UVH_NMI_MMR_TYPE); + pr_warn("UV: NMI handler not present or not supported\n"); } } =20 --=20 2.26.2 From nobody Tue Jun 23 09:11:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFDAEC433EF for ; Tue, 8 Mar 2022 01:06:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344202AbiCHBHd (ORCPT ); Mon, 7 Mar 2022 20:07:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242839AbiCHBHU (ORCPT ); Mon, 7 Mar 2022 20:07:20 -0500 Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C84F30F6E; Mon, 7 Mar 2022 17:06:25 -0800 (PST) Received: from pps.filterd (m0150242.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 227NIDU1019922; Tue, 8 Mar 2022 01:05:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=fDTsdmG1pqyVShSr12ajAIDhLg24fyBw6k5XjNje+2c=; b=hnTalihwQNFzYF149WlS+Q/ctrOMXVU0HoFiQA39Pmwn2k7TlT4bsKc8w5pgmhThsZbQ N1RUHM+aDAOlUxEE7syiebGVCCbqCSUfQIM0mr2U3vpUPR6+m5PNUWfcIuJ1BWMFmzz8 CSAmMbRQ4wRJvMR/XYJuBlRgmKjdGpt1I/GdvCjMP1UFwl/8xaHb1wOGWAF4n/Tbl6ON KxEOnioPhD7q+JWp4yEnS5Ys8Xg3uKatnO5/jsDkSuXOVj7jdysMNEFj8Q5Mc8G9hTs+ U2AH2wLcJO7QlZTk2q27ZPZICkQypxkl1QgRiz4plLnwUCIwXO5XQA4dwkCvbn50MK9Y LA== Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0a-002e3701.pphosted.com (PPS) with ESMTPS id 3ensrf1dcc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Mar 2022 01:05:51 +0000 Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g4t3426.houston.hpe.com (Postfix) with ESMTP id 7A1CC4F; Tue, 8 Mar 2022 01:05:50 +0000 (UTC) Received: from dog.eag.rdlabs.hpecorp.net (dog.eag.rdlabs.hpecorp.net [128.162.243.181]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 960D64A; Tue, 8 Mar 2022 01:05:49 +0000 (UTC) From: Mike Travis To: Borislav Petkov , Ingo Molnar , Thomas Gleixner , Steve Wahl , x86@kernel.org Cc: Mike Travis , Dimitri Sivanich , Andy Shevchenko , Darren Hart , "H. Peter Anvin" , Russ Anderson , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 2/4] x86/platform/uv: Update NMI Handler for UV5 Date: Mon, 7 Mar 2022 19:05:35 -0600 Message-Id: <20220308010537.70150-3-mike.travis@hpe.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220308010537.70150-1-mike.travis@hpe.com> References: <20220308010537.70150-1-mike.travis@hpe.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: wM21q4DL4STOqrLNBdYBhKkeIaVAJzDf X-Proofpoint-GUID: wM21q4DL4STOqrLNBdYBhKkeIaVAJzDf X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-07_12,2022-03-04_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 clxscore=1015 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203080000 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Update NMI handler to interface with UV5 hardware. This involves changing the EVENT_OCCURRED MMR used by the hardware and removes the check for the newer NMI function supported by UV BIOS. Signed-off-by: Mike Travis Reviewed-by: Dimitri Sivanich Reviewed-by: Steve Wahl --- arch/x86/platform/uv/uv_nmi.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index 926a4e006e5a..38f4beae9fab 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -245,7 +245,7 @@ static inline bool uv_nmi_action_is(const char *action) static void uv_nmi_setup_mmrs(void) { /* First determine arch specific MMRs to handshake with BIOS */ - if (UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK) { + if (UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK) { /* UV2,3,4 setup */ uvh_nmi_mmrx =3D UVH_EVENT_OCCURRED0; uvh_nmi_mmrx_clear =3D UVH_EVENT_OCCURRED0_ALIAS; uvh_nmi_mmrx_shift =3D UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT; @@ -255,26 +255,26 @@ static void uv_nmi_setup_mmrs(void) uvh_nmi_mmrx_req =3D UVH_BIOS_KERNEL_MMR_ALIAS_2; uvh_nmi_mmrx_req_shift =3D 62; =20 - } else if (UVH_EVENT_OCCURRED1_EXTIO_INT0_MASK) { + } else if (UVH_EVENT_OCCURRED1_EXTIO_INT0_MASK) { /* UV5 setup */ uvh_nmi_mmrx =3D UVH_EVENT_OCCURRED1; uvh_nmi_mmrx_clear =3D UVH_EVENT_OCCURRED1_ALIAS; uvh_nmi_mmrx_shift =3D UVH_EVENT_OCCURRED1_EXTIO_INT0_SHFT; uvh_nmi_mmrx_type =3D "OCRD1-EXTIO_INT0"; =20 - uvh_nmi_mmrx_supported =3D UVH_EXTIO_INT0_BROADCAST; - uvh_nmi_mmrx_req =3D UVH_BIOS_KERNEL_MMR_ALIAS_2; - uvh_nmi_mmrx_req_shift =3D 62; + uvh_nmi_mmrx_supported =3D 1; + uvh_nmi_mmrx_req =3D 0; =20 } else { - pr_err("UV:%s:cannot find EVENT_OCCURRED*_EXTIO_INT0\n", - __func__); + pr_err("UV:%s:NMI support not available on this system\n", __func__); return; } =20 - /* Then find out if new NMI is supported */ - if (likely(uv_read_local_mmr(uvh_nmi_mmrx_supported))) { - uv_write_local_mmr(uvh_nmi_mmrx_req, - 1UL << uvh_nmi_mmrx_req_shift); + /* Then find out if new NMI is supported (assumed on UV5) */ + if (likely(uvh_nmi_mmrx_supported =3D=3D 1) || + (uv_read_local_mmr(uvh_nmi_mmrx_supported) & 1UL << uvh_nmi_mmrx_req_s= hift)) { + if (uvh_nmi_mmrx_req) + uv_write_local_mmr(uvh_nmi_mmrx_req, + 1UL << uvh_nmi_mmrx_req_shift); nmi_mmr =3D uvh_nmi_mmrx; nmi_mmr_clear =3D uvh_nmi_mmrx_clear; nmi_mmr_pending =3D 1UL << uvh_nmi_mmrx_shift; --=20 2.26.2 From nobody Tue Jun 23 09:11:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AAD4C4332F for ; Tue, 8 Mar 2022 01:06:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231263AbiCHBHT (ORCPT ); Mon, 7 Mar 2022 20:07:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231203AbiCHBHR (ORCPT ); Mon, 7 Mar 2022 20:07:17 -0500 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 097B830F68; Mon, 7 Mar 2022 17:06:21 -0800 (PST) Received: from pps.filterd (m0134423.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 227NH5Qk000527; Tue, 8 Mar 2022 01:05:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=hcFMovqlH/jOOwTXgwe1gQwTDAUcRamv/YkzwgfvOn8=; b=nnyx8Vhgw0BhPxx32egfaJJ/6C56qKNNzSZfm2UkoSIbAhjWWyNEof3wtOXIoaWhZXNG ry5qx2xmGJoEkeMg4cwJjJms2aAMD/jvOf1aewv/2RY6HDqtnZIbH4y9G9DokyhdHxmZ 7+yx+zbXT23sDoFU+z4vo2HtiLtmCVSjfHjNPGK0WAebtAtKQyuusQPZzWJ3mC2fknd9 9PW+c83bz3ts9YgrNGxJ7xn+cJtjpE90/WRJ3BHlAzh8q9r3I/9EUVNFwJls9iIHgGWm bWkKBtRD2rafOqzLYhAcLKPy1QyfGnPe/lX/eWxlv3kvRCYwR3EDj3C/M97KUjznChme 0A== Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3ensnqsjta-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Mar 2022 01:05:52 +0000 Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g4t3427.houston.hpe.com (Postfix) with ESMTP id 83D3E5C; Tue, 8 Mar 2022 01:05:51 +0000 (UTC) Received: from dog.eag.rdlabs.hpecorp.net (dog.eag.rdlabs.hpecorp.net [128.162.243.181]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 9099662; Tue, 8 Mar 2022 01:05:50 +0000 (UTC) From: Mike Travis To: Borislav Petkov , Ingo Molnar , Thomas Gleixner , Steve Wahl , x86@kernel.org Cc: Mike Travis , Dimitri Sivanich , Andy Shevchenko , Darren Hart , "H. Peter Anvin" , Russ Anderson , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 3/4] x86/platform/uv: Update TSC sync state for UV5 Date: Mon, 7 Mar 2022 19:05:36 -0600 Message-Id: <20220308010537.70150-4-mike.travis@hpe.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220308010537.70150-1-mike.travis@hpe.com> References: <20220308010537.70150-1-mike.travis@hpe.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: kfqP2Sn8__RXnLC9SdmU4NrQTBiqvjMH X-Proofpoint-GUID: kfqP2Sn8__RXnLC9SdmU4NrQTBiqvjMH X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-07_12,2022-03-04_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 impostorscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203080000 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Update TSC to not check TSC sync state for uv5+ as it is not available. Therefore it is assumed that TSC will always be in sync for multiple chassis and will pass the tests for the kernel to accept it as the clocksource. To disable this check use the kernel start options tsc=3Dreliable clocksource=3Dtsc. Signed-off-by: Mike Travis Reviewed-by: Dimitri Sivanich Reviewed-by: Steve Wahl --- arch/x86/kernel/apic/x2apic_uv_x.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2ap= ic_uv_x.c index f5a48e66e4f5..387d6533549a 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -199,10 +199,16 @@ static void __init uv_tsc_check_sync(void) int mmr_shift; char *state; =20 - /* Different returns from different UV BIOS versions */ + /* UV5+, sync state from bios not available, assumed valid */ + if (!is_uv(UV2|UV3|UV4)) { + pr_debug("UV: TSC sync state for UV5+ assumed valid\n"); + mark_tsc_async_resets("UV5+"); + return; + } + + /* UV2,3,4, UV BIOS TSC sync state available */ mmr =3D uv_early_read_mmr(UVH_TSC_SYNC_MMR); - mmr_shift =3D - is_uv2_hub() ? UVH_TSC_SYNC_SHIFT_UV2K : UVH_TSC_SYNC_SHIFT; + mmr_shift =3D is_uv2_hub() ? UVH_TSC_SYNC_SHIFT_UV2K : UVH_TSC_SYNC_SHIFT; sync_state =3D (mmr >> mmr_shift) & UVH_TSC_SYNC_MASK; =20 /* Check if TSC is valid for all sockets */ --=20 2.26.2 From nobody Tue Jun 23 09:11:13 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F3D3C433EF for ; Tue, 8 Mar 2022 01:06:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344182AbiCHBHb (ORCPT ); Mon, 7 Mar 2022 20:07:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231203AbiCHBHT (ORCPT ); Mon, 7 Mar 2022 20:07:19 -0500 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 530AB30F5E; Mon, 7 Mar 2022 17:06:24 -0800 (PST) Received: from pps.filterd (m0150245.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 227NHfRf029071; Tue, 8 Mar 2022 01:05:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=CBLZUvJwTvZgvVTiHXB3rzyC3r9whRr4WuoQWFxsV2I=; b=jLF/HikJgO7qO5jGq6tThm4T11a7HRepNkBffB1wnUkkgn+IYCUMRKjBP10pj0RVZ7FQ bzS/Ary2YmOOwURCe1Cpw+QXWUA6PaPjtxuB85/f033MhFhQdIA9N3NDnXHUDyVtc0j4 UK5p1LX/FfjXC4XjgbUzPZpsPoiUtpXND7W+ecOy8563I7C9dFYGu974Vp9tP/kzWzBU WTJUGtJvM4DWsTdtSQp0dneId9cwV/a+paAW24Oc3lbWZVPS2mRxCFN2UbtUgmJOM0B7 4n/vfyIQTYPbHrlU5bAUnehvc1JXLJCyII59cTp7PmdGElIJT8DVsiUpNIt+UqyoVbz5 Fg== Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3enrj924cp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Mar 2022 01:05:53 +0000 Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g9t5009.houston.hpe.com (Postfix) with ESMTP id DC9275C; Tue, 8 Mar 2022 01:05:52 +0000 (UTC) Received: from dog.eag.rdlabs.hpecorp.net (dog.eag.rdlabs.hpecorp.net [128.162.243.181]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 94D654A; Tue, 8 Mar 2022 01:05:51 +0000 (UTC) From: Mike Travis To: Borislav Petkov , Ingo Molnar , Thomas Gleixner , Steve Wahl , x86@kernel.org Cc: Mike Travis , Andy Shevchenko , Darren Hart , Dimitri Sivanich , "H. Peter Anvin" , Russ Anderson , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 4/4] x86/platform/uv: Add gap hole end size Date: Mon, 7 Mar 2022 19:05:37 -0600 Message-Id: <20220308010537.70150-5-mike.travis@hpe.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220308010537.70150-1-mike.travis@hpe.com> References: <20220308010537.70150-1-mike.travis@hpe.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 5387J3DsapA2vH0u7FrS17HrAxxFb92Q X-Proofpoint-GUID: 5387J3DsapA2vH0u7FrS17HrAxxFb92Q X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-07_12,2022-03-04_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 mlxscore=0 adultscore=0 mlxlogscore=935 clxscore=1015 bulkscore=0 priorityscore=1501 spamscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203080000 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Show value of gap end in kernel log which equates to number of physical address bits used by system. The structure stores PA bits 56:26, for 64MB granularity, up to 64PB max size. Signed-off-by: Mike Travis Reviewed-by: Steve Wahl --- arch/x86/kernel/apic/x2apic_uv_x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2ap= ic_uv_x.c index 387d6533549a..146f0f63a43b 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -1346,7 +1346,7 @@ static void __init decode_gam_params(unsigned long pt= r) static void __init decode_gam_rng_tbl(unsigned long ptr) { struct uv_gam_range_entry *gre =3D (struct uv_gam_range_entry *)ptr; - unsigned long lgre =3D 0; + unsigned long lgre =3D 0, gend =3D 0; int index =3D 0; int sock_min =3D 999999, pnode_min =3D 99999; int sock_max =3D -1, pnode_max =3D -1; @@ -1380,6 +1380,9 @@ static void __init decode_gam_rng_tbl(unsigned long p= tr) flag, size, suffix[order], gre->type, gre->nasid, gre->sockid, gre->pnode); =20 + if (gre->type =3D=3D UV_GAM_RANGE_TYPE_HOLE) + gend =3D (unsigned long)gre->limit << UV_GAM_RANGE_SHFT; + /* update to next range start */ lgre =3D gre->limit; if (sock_min > gre->sockid) @@ -1397,7 +1400,8 @@ static void __init decode_gam_rng_tbl(unsigned long p= tr) _max_pnode =3D pnode_max; _gr_table_len =3D index; =20 - pr_info("UV: GRT: %d entries, sockets(min:%x,max:%x) pnodes(min:%x,max:%x= )\n", index, _min_socket, _max_socket, _min_pnode, _max_pnode); + pr_info("UV: GRT: %d entries, sockets(min:%x,max:%x), pnodes(min:%x,max:%= x), gap_end(%d)\n", + index, _min_socket, _max_socket, _min_pnode, _max_pnode, fls64(gend)); } =20 /* Walk through UVsystab decoding the fields */ --=20 2.26.2