From patchwork Wed May 31 22:13:39 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: 101608 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3218071vqr; Wed, 31 May 2023 15:32:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4vWXEigbeDiBmA1l68wgif1fMHTL+MBe7QMVYsQjxRhD4ApwhvnqtClmQ7B4GB7Sp29tqu X-Received: by 2002:a17:902:788b:b0:1b0:1d7b:ed33 with SMTP id q11-20020a170902788b00b001b01d7bed33mr5297352pll.69.1685572336281; Wed, 31 May 2023 15:32:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685572336; cv=none; d=google.com; s=arc-20160816; b=rB68ZKSJcygVOrtp0gUM94E6bz9vUs3WUxNvP8kbNq/3SI3Nv0R29AXgZQwHowkGQS 4sV6WHv+/HQ02r4t5RbO7hzkLYBcoB+lUtUtk+pvdAWIZhsjjSKvS+lMQveeVvWrZer+ H46c+6h9VJM8czfIwr5c7mEWdjYn8U0MeOAxGwLO4Wyax9xvXXiLdAfQB4uW1pp0E5A1 8e4RMYtnvqe61M+oU7ncp2dGAyFnfkE5mHcwYjbv3XHnFNQvpkCJvMbKjnzSAcx13BGb rlXYZC61lYUI9odxbNjgMHAYzvmB64e4LQx4ANKqVBloKWzK+pw8/pGl6qiBV5Mo7zww ArAA== 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=RyAuRqTy1fbN+GDp6EbhCMVykYjZ/OHOgmYeMhxygFc=; b=StYbQ8RNOSjDR7PuqA5s4fFbmNdIMZCRXh09flpDbUOBgYiHTFarG4j+kXAeDIXjvF BDKHI1oyvg6zoKvKb6/Mz1YKFTJSa6rpG1bTzGPHBqfko9BLtQ+g1q+cMJVZnuBHj1Gr kLXT6KLG93HMLtmQ8zukJvr9NBtMadXkmYIBcdXYPhPsRyslQ3XcnL+0xpAivRz7ABma WKolTVjGkC2cnInTKt9tY05MvVnlAWXIuHL7m5B2+8oBbbhIdkRiyyE/S24hDsd4we7R bCSjzrCt/kzGjEOtrxuhoQsFXiFd8EAfVN3BOpdTKbN+HcLVS2jOQGkwLa99yjYXaIVm OMQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="J/7UYao1"; dkim=neutral (no key) header.i=@linutronix.de; 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 h4-20020a170902748400b001b00ffb44c6si1615743pll.82.2023.05.31.15.32.01; Wed, 31 May 2023 15:32:16 -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="J/7UYao1"; dkim=neutral (no key) header.i=@linutronix.de; 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 S231272AbjEaWOt (ORCPT + 99 others); Wed, 31 May 2023 18:14:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230515AbjEaWOe (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 3B3D9137; Wed, 31 May 2023 15:14:13 -0700 (PDT) Date: Wed, 31 May 2023 22:13:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1685571219; 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=RyAuRqTy1fbN+GDp6EbhCMVykYjZ/OHOgmYeMhxygFc=; b=J/7UYao1W4ti4EVmSs31Mr5tfk4+QGhT0Uonms83G1NrBgJzDnAAIhILcgni0O9SSexpaj 6+DHVYAeTfYrn/b8Ahl4Rncjgg+cHTqeNItO3ee1vrMtxRkNiazOmOp+XE+IbTTfd+pEEv CJ3HJEif+gTfW/x0YlUHSHsC92jWMK4eO/wvGH/3LardIlN37qiDncOVvMUzinx9p4zLcv B6S60SWPjzE6pIzHriav71EOfpwMd7y6LV/a2t6bbcBFUVqBv1YVUsDtdOr7lFQ6zuxsPH bSgcvRa471z7P1z9SrOnB1hOdpb6aLhSUPRaW46/w6+yH4wp8BEn97PWDJDNXA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1685571219; 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=RyAuRqTy1fbN+GDp6EbhCMVykYjZ/OHOgmYeMhxygFc=; b=kh9xDv+97fpuW2hZWEJ9VRu5E+2URCxUP+Bjg6MCtuDEiyNyoOkwMHsyLUf3NWp3T2GI3X OKaSnr3xdyOW0iCw== 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: Add platform resolving #defines for misc GAM_MMIOH_REDIRECT* Cc: Steve Wahl , Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <168557121922.404.12896947881477321442.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?1767450698381235027?= X-GMAIL-MSGID: =?utf-8?q?1767450698381235027?= The following commit has been merged into the x86/platform branch of tip: Commit-ID: fd27bea340012412a5ad1476b0a40381d7407550 Gitweb: https://git.kernel.org/tip/fd27bea340012412a5ad1476b0a40381d7407550 Author: Steve Wahl AuthorDate: Fri, 19 May 2023 14:07:45 -05:00 Committer: Dave Hansen CommitterDate: Wed, 31 May 2023 09:34:59 -07:00 x86/platform/uv: Add platform resolving #defines for misc GAM_MMIOH_REDIRECT* Upcoming changes will require use of new #defines UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK and UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK, which provide the appropriate values on different uv platforms. Also, fix typo that defined a couple of "*_CONFIG0_*" values twice where "*_CONFIG1_*" was intended. Signed-off-by: Steve Wahl Signed-off-by: Dave Hansen Link: https://lore.kernel.org/all/20230519190752.3297140-2-steve.wahl%40hpe.com --- arch/x86/include/asm/uv/uv_mmrs.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h index 57fa673..bb45812 100644 --- a/arch/x86/include/asm/uv/uv_mmrs.h +++ b/arch/x86/include/asm/uv/uv_mmrs.h @@ -4199,6 +4199,13 @@ union uvh_rh_gam_mmioh_overlay_config1_u { #define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT 0 #define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK 0x0000000000007fffUL +/* UVH common defines */ +#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK ( \ + is_uv(UV4A) ? UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK : \ + is_uv(UV4) ? UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK : \ + is_uv(UV3) ? UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK : \ + 0) + union uvh_rh_gam_mmioh_redirect_config0_u { unsigned long v; @@ -4247,8 +4254,8 @@ union uvh_rh_gam_mmioh_redirect_config0_u { 0) /* UV4A unique defines */ -#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT 0 -#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK 0x0000000000000fffUL +#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT 0 +#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK 0x0000000000000fffUL /* UV4 unique defines */ #define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT 0 @@ -4258,6 +4265,13 @@ union uvh_rh_gam_mmioh_redirect_config0_u { #define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT 0 #define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK 0x0000000000007fffUL +/* UVH common defines */ +#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK ( \ + is_uv(UV4A) ? UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK : \ + is_uv(UV4) ? UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK : \ + is_uv(UV3) ? UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK : \ + 0) + union uvh_rh_gam_mmioh_redirect_config1_u { unsigned long v;