From mboxrd@z Thu Jan 1 00:00:00 1970 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 A55ECC43334 for ; Thu, 9 Jun 2022 17:53:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345207AbiFIRxG (ORCPT ); Thu, 9 Jun 2022 13:53:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237685AbiFIRw4 (ORCPT ); Thu, 9 Jun 2022 13:52:56 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DE1E44A0A for ; Thu, 9 Jun 2022 10:52:55 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 3F18C32009B4; Thu, 9 Jun 2022 13:52:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 09 Jun 2022 13:52:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1654797172; x=1654883572; bh=NP lvGbpWe3tdccHpDPunMo3g/eJ+mFewyfL3DA2+pmg=; b=jeDvndkXiscmTy0nS3 PgFDpL/m84xWB9iDdKJc+m8BzNG0dzYLnOUECadviLsTnp3shfBoMIIXUZtYMllm yrKargcVAzo8NEmbju6ZNsNZwDjysGs+uCZnR6t2Mg7X9p2GrJZRFh5KolgDhZse xKb52z5oSqq5BKK0WwWsVWyK1qznvUWSIlYDlvZXwHTzS6NxPzl6sTHMmLFb/Gv5 X2JqWcTzx+IuzUkeU5/MeeUgvi0YoDyo86TigV13bNap3tUL5qBG1B+whqcucoO7 AePsQgOvlphEUkKEZ9ufygExJ9wc+Pf9Hf3/yab+VN/IW7npEzDwRF+2eY5CqJnL ycgQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1654797172; x=1654883572; bh=NPlvGbpWe3tdc cHpDPunMo3g/eJ+mFewyfL3DA2+pmg=; b=Mi9CifMxcLMG2mIO3lTLFdvboXwTk kg1JSmurIACiEmxd0f3QbCV+Ldy+7vUDPPfIAqf4+STzJeh5PSP+SA7YPaU6UyUF OtoXnXL9FT570X6Ur50TZ3uf6xsSO5czWQYnGG+Y2oHGCkTwsw9IHCrqx6VZUgCT ttOTmZTCO2kOwda9ogmm6Ynnsisp2ejMFH8jiCK60gJ7wFMazHKzt3jAMdxaT8Em S0Ni4KdiyehPErlME6woTOW50vpeBgMWWi/9+BKW20ZlDGOKy0yjoxjUiwu+tJL5 Xais3LlJvD9lqYVdXSfTR70WQzhhXAcFVH4lgkudI70TRRPBVUzXWF+qQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddtledgudduvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestd ekredtredttdenucfhrhhomheplfhirgiguhhnucgjrghnghcuoehjihgrgihunhdrhigr nhhgsehflhihghhorghtrdgtohhmqeenucggtffrrghtthgvrhhnpeefledufeehgedvue dvvdegkefgvddttedtleeiiefhgeetudegkefhvdfhjeeftdenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjihgrgihunhdrhigrnhhgsehflh ihghhorghtrdgtohhm X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 9 Jun 2022 13:52:51 -0400 (EDT) From: Jiaxun Yang To: chenhuacai@kernel.org Cc: kernel@xen0n.name, maz@kernel.org, linux-kernel@vger.kernel.org, Jiaxun Yang Subject: [PATCH for-5.19 v2 2/2] loongarch: Mask out higher bits for cpuid and rename the function Date: Thu, 9 Jun 2022 18:52:42 +0100 Message-Id: <20220609175242.977-2-jiaxun.yang@flygoat.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220609175242.977-1-jiaxun.yang@flygoat.com> References: <20220609175242.977-1-jiaxun.yang@flygoat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Only low 9 bits of CPUID CSR represents coreid, higher bits are marked as reserved. In case Loongson may define higher bits in future, just mask them out for get_csr_cpuid. Also, as we already have read_csr_cpuid, rename get_csr_cpuid to get_csr_coreid to reflect the actual bit domain name. Signed-off-by: Jiaxun Yang --- arch/loongarch/include/asm/loongarch.h | 4 ++-- drivers/irqchip/irq-loongson-liointc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/include/asm/loongarch.h b/arch/loongarch/include/asm/loongarch.h index 3ba4f7e87cd2..fe2408144fa3 100644 --- a/arch/loongarch/include/asm/loongarch.h +++ b/arch/loongarch/include/asm/loongarch.h @@ -1198,9 +1198,9 @@ static inline u64 drdtime(void) return val; } -static inline unsigned int get_csr_cpuid(void) +static inline unsigned int get_csr_coreid(void) { - return csr_read32(LOONGARCH_CSR_CPUID); + return csr_read32(LOONGARCH_CSR_CPUID) & CSR_CPUID_COREID; } static inline void csr_any_send(unsigned int addr, unsigned int data, diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c index 8d05d8bcf56f..2ee636b2d827 100644 --- a/drivers/irqchip/irq-loongson-liointc.c +++ b/drivers/irqchip/irq-loongson-liointc.c @@ -42,7 +42,7 @@ #if defined(CONFIG_MIPS) #define liointc_core_id get_ebase_cpunum() #else -#define liointc_core_id get_csr_cpuid() +#define liointc_core_id read_csr_cpuid() #endif struct liointc_handler_data { -- 2.25.1