From patchwork Wed May 31 22:13:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 101605 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3216585vqr; Wed, 31 May 2023 15:29:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5hjHCBbZc2jxItN61tk3WXW8JR3yRmGLk+HUa7A6Elrkv9jkfp000qA6fPvhjinUhBRvQ6 X-Received: by 2002:a17:902:7290:b0:1af:ffda:855a with SMTP id d16-20020a170902729000b001afffda855amr5396238pll.9.1685572160073; Wed, 31 May 2023 15:29:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685572160; cv=none; d=google.com; s=arc-20160816; b=e+2YMNbT4SUReIutb11sQwUZTpN6cQPOccvRNhH52SJq7HKDkWtPhNR7kr7tOXhZ6g jPFGsuzCtry3ubjCReSCJps8NDFJZfqlwbAaKeTqAs4z61bN09bMdVZrajbvi2C/BOMx OyTvsqCSkBD1aBCANUmdDPga1ptdm2Gz/hqxpdyotCJLi1TTexDhtiV6WT7Ed6JACfJk hjS1QukXFDpsCpb+hFtaWIdZcRMVp/s14SV/U2AkzHJTdBCPr/9YdsBJilHjVkV+IDM+ QejWByDvABq0PZ4/JIwtt5mPWW7JAKyLuCj2xvJyuWtITXhrmwRkR8++ddbse9lqEYu0 SLbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=Dfl+bzG7o/eFPC1aATqO2T6EL2+L+fj78OJOHP/rVCo=; b=QDs4Otag0shBzKW2Rx5B+LIaKcyr6BBDtESaraiAgqPIcXv0USU+25+c6IMwTKVnKh J8ei7/s1c1Ki/ym2wncd1KzMadMfkF3E3619bX9UYB+5icLADLDRv2fN0ENjNQfpEHxv fLAhWWcDw1qBAnpJ8UnC5s/LR5cJHHGpiFgsxfi7y1tunvjR9Xal6QgXgU2pv9th/5BF ajaUyMGrbSlwqrG6FJUib8/yFLFkfm0agYTOiId8wuh9CPgGwSevYOY0+gCGzGYDxLjO ci/g4S+3Q34O6Gr8DqEXX7q4ESIW1kMJ2qa7DN4yzeHlUpdbBYWKT+ft7WKQ8Dp01nQa KR8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ZXHUw++W; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i16-20020a17090332d000b001b03fc03accsi1757505plr.351.2023.05.31.15.29.08; Wed, 31 May 2023 15:29:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ZXHUw++W; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231172AbjEaWP3 (ORCPT + 99 others); Wed, 31 May 2023 18:15:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231160AbjEaWOe (ORCPT ); Wed, 31 May 2023 18:14:34 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DD97125; Wed, 31 May 2023 15:14:13 -0700 (PDT) Date: Wed, 31 May 2023 22:13:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1685571218; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dfl+bzG7o/eFPC1aATqO2T6EL2+L+fj78OJOHP/rVCo=; b=ZXHUw++WVAZX5OczPrYoXGhvs7T3Jk2dK+hoMbGkXHd7vxIsIMI8YfcMSSu8mBfGD1D9mv zi8A4OHadE/wI0K7BiRVMMwTndW4Dwoa55nEiZVha0iCeXYAJII0wJAlzjGB0teuPlBB4U EF6zMw2hJ4fw0A+NpWxEIjgXeDSdh6PM6iiScVVOpG6FSlcdO8NZD58hRrSRFA3tciLPV+ fPxvD9WAh9tBkE7VOQgpbyyhg1IXcShNpiiP0ZwVdoiQMdqq7cd3l+jGDR3ykK5og++9Uu UGKm/Y4A/ffW+QyaPrZPs2z2W7qDLIvUqsvjnwQac2ESAzzdHNC03Vo0mZYzjg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1685571218; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dfl+bzG7o/eFPC1aATqO2T6EL2+L+fj78OJOHP/rVCo=; b=tjjEGn1l83E70fnFPETZH17fA3/vJMHaxmZWFnkMuy9XavpVvOV34GEf6sa4oHAIi748qf 6yTT1f0phCzSEqBQ== From: "tip-bot2 for Steve Wahl" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] x86/platform/uv: Fix printed information in calc_mmioh_map Cc: Steve Wahl , Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <168557121818.404.10436980757207022007.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767450513300895153?= X-GMAIL-MSGID: =?utf-8?q?1767450513300895153?= The following commit has been merged into the x86/platform branch of tip: Commit-ID: e4860f03779cadff011a7a8685c7157ebc133bda Gitweb: https://git.kernel.org/tip/e4860f03779cadff011a7a8685c7157ebc133bda Author: Steve Wahl AuthorDate: Fri, 19 May 2023 14:07:47 -05:00 Committer: Dave Hansen CommitterDate: Wed, 31 May 2023 09:34:59 -07:00 x86/platform/uv: Fix printed information in calc_mmioh_map Fix incorrect mask names and values in calc_mmioh_map() that caused it to print wrong NASID information. And an unused blade position is not an error condition, but will yield an invalid NASID value, so change the invalid NASID message from an error to a debug message. Signed-off-by: Steve Wahl Signed-off-by: Dave Hansen Link: https://lore.kernel.org/all/20230519190752.3297140-4-steve.wahl%40hpe.com --- arch/x86/kernel/apic/x2apic_uv_x.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 4828552..6d2739e 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -1022,7 +1022,7 @@ static void __init calc_mmioh_map(enum mmioh_arch index, switch (index) { case UVY_MMIOH0: mmr = UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG0; - nasid_mask = UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK; + nasid_mask = UVYH_RH10_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK; n = UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG0_DEPTH; min_nasid = min_pnode; max_nasid = max_pnode; @@ -1030,7 +1030,7 @@ static void __init calc_mmioh_map(enum mmioh_arch index, break; case UVY_MMIOH1: mmr = UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG1; - nasid_mask = UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK; + nasid_mask = UVYH_RH10_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK; n = UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG1_DEPTH; min_nasid = min_pnode; max_nasid = max_pnode; @@ -1038,7 +1038,7 @@ static void __init calc_mmioh_map(enum mmioh_arch index, break; case UVX_MMIOH0: mmr = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0; - nasid_mask = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK; + nasid_mask = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK; n = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_DEPTH; min_nasid = min_pnode * 2; max_nasid = max_pnode * 2; @@ -1046,7 +1046,7 @@ static void __init calc_mmioh_map(enum mmioh_arch index, break; case UVX_MMIOH1: mmr = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1; - nasid_mask = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK; + nasid_mask = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK; n = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_DEPTH; min_nasid = min_pnode * 2; max_nasid = max_pnode * 2; @@ -1072,8 +1072,9 @@ static void __init calc_mmioh_map(enum mmioh_arch index, /* Invalid NASID check */ if (nasid < min_nasid || max_nasid < nasid) { - pr_err("UV:%s:Invalid NASID:%x (range:%x..%x)\n", - __func__, index, min_nasid, max_nasid); + /* Not an error: unused table entries get "poison" values */ + pr_debug("UV:%s:Invalid NASID(%x):%x (range:%x..%x)\n", + __func__, index, nasid, min_nasid, max_nasid); nasid = -1; }