From nobody Fri Sep 25 14:31:21 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4521637B3FE for ; Fri, 11 Sep 2026 07:52:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113156; cv=none; b=gJdA5XTBdzutzKMaQW259FZHdzyfLhuO60JdyMZDPYcbrNR+VsAAoMEYjrBP00rLzUFqRdAwedi2gDK1e8m6GPgJk9arRLm8UjloI+8FDmZnIwvZsKP+4ggSvExDuDOlYlHqSFtPNgTDOJwf7IY2vgD4b9nJ699bcfYFI7BbXjs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113156; c=relaxed/simple; bh=zKVTpbaqZQGDnlZVrQpYimyyXAfV+bdYo0NaEiz/Irg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eDOA9NQwnqvr4WtcW/e7B4WJn8kMvmFebZ+aNK41scyedIHMHus1n3tAi7tLqrghhVqxfOXJmRkRRUBREwrmh9MkMV3hxZEBlPiyJEn1brdKiHo7hhrYD+s0oAxTuBJJZ2uU5AvVmyqx1GJhKaWcTdEKNBu1hBQ09wzoOmuMV3A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=bwJgaBmg; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=ockUKlZR; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="bwJgaBmg"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="ockUKlZR" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 351B91FD88; Fri, 11 Sep 2026 07:52:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113149; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WY/ZqseogEE8lk5OuTAGz9kQGz3dk5AeE8smZ2J6lsA=; b=bwJgaBmg9DEmkPIdlE144gWibQalvZ6AdKnMYOmk52A41Idft397ArmHZlLJkNNHYTFEke QjZQxU1xD2DH8sZ9Cc3BeMGjtzrEujIW3V8gybj8bbUm4eex0NmKKfX1RPIwdHWM0xfORT sjTrGJXGf3WClUOmC9s0xZ29Cn6Q7tA= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=ockUKlZR DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113145; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WY/ZqseogEE8lk5OuTAGz9kQGz3dk5AeE8smZ2J6lsA=; b=ockUKlZRjUHJLQcAYEgbJIV7wfaE+IBz+FAOiroa7OsxsCe0ZHIGEz0mayGJ83yfyB50ED BnnJ4hz5a7h64pez6qRZa0Fy98zOhxWgkn0h3oPCqeADLIj6YPdB+oxpn3jDsXH14KjyN5 wpBl8361zStMF2JX6mD0/mLhckWmSLM= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B273F13715; Fri, 11 Sep 2026 07:52:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id Ck9HKjizo2rrXwAAD6G6ig (envelope-from ); Fri, 11 Sep 2026 07:52:24 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Tony Luck , Reinette Chatre , Dave Martin , James Morse , Babu Moger Subject: [PATCH v2 1/5] x86/msr: Switch users of native_wrmsr() to native_wrmsrq() Date: Fri, 11 Sep 2026 09:52:12 +0200 Message-ID: <20260911075216.3142309-2-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911075216.3142309-1-jgross@suse.com> References: <20260911075216.3142309-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 351B91FD88 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWELVE(0.00)[13]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[suse.com:+]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:dkim,suse.com:email,suse.com:mid,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo] X-Spam-Flag: NO X-Spam-Score: -3.01 Content-Type: text/plain; charset="utf-8" Switch all users of native_wrmsr() to native_wrmsrq() in order to prepare removal of native_wrmsr(). Signed-off-by: Juergen Gross --- V2: - switch order of hi and lo parts when oring them (Reinette Chatre) --- arch/x86/coco/sev/internal.h | 7 +------ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/x86/coco/sev/internal.h b/arch/x86/coco/sev/internal.h index b9632c0fc391..2e2ff48a7aae 100644 --- a/arch/x86/coco/sev/internal.h +++ b/arch/x86/coco/sev/internal.h @@ -80,12 +80,7 @@ static inline u64 sev_es_rd_ghcb_msr(void) =20 static __always_inline void sev_es_wr_ghcb_msr(u64 val) { - u32 low, high; - - low =3D (u32)(val); - high =3D (u32)(val >> 32); - - native_wrmsr(MSR_AMD64_SEV_ES_GHCB, low, high); + native_wrmsrq(MSR_AMD64_SEV_ES_GHCB, val); } =20 enum es_result __vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt,= bool write); diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cp= u/resctrl/pseudo_lock.c index 0408ac7f66fd..a04cf26e0302 100644 --- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c +++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c @@ -175,7 +175,7 @@ int resctrl_arch_pseudo_lock_fn(void *_plr) * pseudo-locked followed by reading of kernel memory to load it * into the cache. */ - native_wrmsr(MSR_IA32_PQR_ASSOC, rmid_p, plr->closid); + native_wrmsrq(MSR_IA32_PQR_ASSOC, rmid_p | ((u64)plr->closid << 32)); =20 /* * Cache was flushed earlier. Now access kernel memory to read it @@ -212,7 +212,7 @@ int resctrl_arch_pseudo_lock_fn(void *_plr) * Critical section end: restore closid with capacity bitmask that * does not overlap with pseudo-locked region. */ - native_wrmsr(MSR_IA32_PQR_ASSOC, rmid_p, closid_p); + native_wrmsrq(MSR_IA32_PQR_ASSOC, (u64)closid_p << 32 | rmid_p); =20 /* Re-enable the hardware prefetcher(s) */ wrmsrq(MSR_MISC_FEATURE_CONTROL, saved_msr); --=20 2.55.0 From nobody Fri Sep 25 14:31:21 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 393881A6838 for ; Fri, 11 Sep 2026 07:52:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113162; cv=none; b=EuVp9t8Tz5S3G4Ge+nUzMveKoDnJtR+xxJ9nfDNGs0vQs2n0utDeYAjqsd31rYUQVCatwiY8TVQC+6xE9cH8lEvsLfb6aap13Jn9zVADr77vIvRx3fTDMaHFgmWcwMD2SWQ1IZwrr0t7FIdZRnpqf7B3ueM5F2pExhMHJS6MgO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113162; c=relaxed/simple; bh=6AE1owqySV2xrSwSgCIGV4e51eXVhc5hAMDhjV5VG3M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pOPeyxdsL+PRxCmy6UMkWVSuYn29NkJKnYld228JWxpV5B17PXp2TFEd5pxzT59DU72i0M6A0CMGEkUzM2hIbOaDMPGboEACVjlUyMg94TV8LjMS9FfBUcSxKy/5RO3moZCEC6ptNLFhIiwf1ScA0diLlQOMq/sbgECZKrsMbak= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=fJgJNu3U; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=PiMCF3+7; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="fJgJNu3U"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="PiMCF3+7" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E597221D37; Fri, 11 Sep 2026 07:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113155; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GOvVFBJSlIZ54cIrSULNavAILkGHAg9pGp9S4uew0eU=; b=fJgJNu3Udx2FbXpCAHrK08Br7F1MHhbtCYr5cHeEev98y6cpdt5ACTDx8uwiXN1xpCcXrN vEZVGRTbfG6z1+l/e+Htdrz4DmLGt7h+mfn4l7Wcvf/VZGzpbTcovooLmN2LOld7z44aeK UZWRSHOOG7lHa6dYJyYKJLVF0M5NfNA= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=PiMCF3+7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113150; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GOvVFBJSlIZ54cIrSULNavAILkGHAg9pGp9S4uew0eU=; b=PiMCF3+7e84hESivbFTkF+oVC/Tf3FtoDEfjwtuwoK65Hl45g6wYBS8gTTo6xXoMC71w5o NDXWvRwk0RrvkwGvsa1ieeD5POuefGn+9VyjN5YK767enjaftevGnN/FXoGiXtUKb4KP5o rJZ3xd4D2adEig/35hbu172wlNkG8LE= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 81938136ED; Fri, 11 Sep 2026 07:52:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id HrUxHj6zo2r+XwAAD6G6ig (envelope-from ); Fri, 11 Sep 2026 07:52:30 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v2 2/5] x86/msr: Remove native_wrmsr() Date: Fri, 11 Sep 2026 09:52:13 +0200 Message-ID: <20260911075216.3142309-3-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911075216.3142309-1-jgross@suse.com> References: <20260911075216.3142309-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Rspamd-Queue-Id: E597221D37 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Level: X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[suse.com:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_SEVEN(0.00)[8]; R_RATELIMIT(0.00)[to_ip_from(RLkdkdrsxe9hqhhs5ask8616i6)]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:dkim,suse.com:email,suse.com:mid] X-Spam-Flag: NO Content-Type: text/plain; charset="utf-8" As native_wrmsr() has no users left, remove it. Signed-off-by: Juergen Gross --- arch/x86/include/asm/msr.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 95761803c2e6..bfad2b96a892 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -95,9 +95,6 @@ static __always_inline u64 native_rdmsrq(u32 msr) return __rdmsr(msr); } =20 -#define native_wrmsr(msr, low, high) \ - __wrmsrq((msr), (u64)(high) << 32 | (low)) - #define native_wrmsrq(msr, val) \ __wrmsrq((msr), (val)) =20 --=20 2.55.0 From nobody Fri Sep 25 14:31:21 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3B7D459AD9 for ; Fri, 11 Sep 2026 07:52:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113168; cv=none; b=YBJ5YumBl5kDZkQtEfAdB2ztG+AdDea25ckcmQWv5d+n8Tz/sGE4x/Kw0Ylr2Ey8I2jCS2n2Cbo4Z6rrGFa+wLQmeOeg0zSe4+5YDraVrunEp/NAVeKtuAwdBiNemj0h06jJsjgIMZzC8shEVxJaeTLlLsruo5YN/8qxCBCKkSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113168; c=relaxed/simple; bh=/eWQeo9koRJgrBCgnEff44nXQQ2kUKsppO3UvLLD9yk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mXe/OClAlPYqfSInqPaCHMIF5AEV/7PpRHXqUARrnF/XjO8xum8/IzYvdt9Bfvz13GWXBqH2U8k1MQFM5OcC8jrpNbiINYAslx5HwuwUGsSZd4O6VK6/qMzB0AnAmQji6CV/PR2KQXAEkK/eJ1ghlHBukdveE6+/SIVp/dHxC3o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=GDWohYTr; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=fydkNycs; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="GDWohYTr"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="fydkNycs" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C265F21D30; Fri, 11 Sep 2026 07:52:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113160; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PS1lMat3e0bc2mKTSmwxcGje28XFS7xN8LQ1bb5HiWM=; b=GDWohYTr0FHX52oGS1Jhbv1yZopho/hnIDVORSm+FuL1uM58Xk11ys6xMnKCaNpljRo8Co KFOBLnwTllOU85OyAhYQFmNioBd5f6wMRKA7uGwI/jTto+eVOT5FZHiz1+BrG0ET2j+LOD O9iHWfO0Qnj0czBu8gRHtSulZd/D+Qk= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113156; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PS1lMat3e0bc2mKTSmwxcGje28XFS7xN8LQ1bb5HiWM=; b=fydkNycsWyzL91yL2EsNY8rvGootfcYC+kzioJDFj8me0rFSlL3dk8JlQMuBFHsDiQX4wo M3EWFoAwsOkDXShyRBEK/PMmLUQxdF0e/iGPfNrX9xFKwPTecoDqswcHtZKEcwlkvkp1lP MRnc7bM2PRXKAjm9qwZSPKcJ8KEqbpc= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4072B13770; Fri, 11 Sep 2026 07:52:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 3xpSDkSzo2oPYAAAD6G6ig (envelope-from ); Fri, 11 Sep 2026 07:52:36 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v2 3/5] x86/msr: Switch users of native_rdmsr() to native_rdmsrq() Date: Fri, 11 Sep 2026 09:52:14 +0200 Message-ID: <20260911075216.3142309-4-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911075216.3142309-1-jgross@suse.com> References: <20260911075216.3142309-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Spam-Score: -2.80 X-Spam-Flag: NO X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.997]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_SEVEN(0.00)[8]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="utf-8" Switch all users of native_rdmsr() to native_rdmsrq() in order to prepare removal of native_rdmsr(). Signed-off-by: Juergen Gross --- arch/x86/include/asm/microcode.h | 6 +----- arch/x86/kernel/cpu/intel.c | 6 +++--- arch/x86/kernel/cpu/microcode/amd.c | 4 ++-- arch/x86/kernel/cpu/microcode/core.c | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microc= ode.h index 645e65ac1586..6eef329def4b 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -64,17 +64,13 @@ static inline int intel_microcode_get_datasize(struct m= icrocode_header_intel *hd =20 static inline u32 intel_get_microcode_revision(void) { - u32 rev, dummy; - native_wrmsrq(MSR_IA32_UCODE_REV, 0); =20 /* As documented in the SDM: Do a CPUID 1 here */ native_cpuid_eax(1); =20 /* get the current revision from MSR 0x8B */ - native_rdmsr(MSR_IA32_UCODE_REV, dummy, rev); - - return rev; + return native_rdmsrq(MSR_IA32_UCODE_REV) >> 32; } #endif /* !CONFIG_CPU_SUP_INTEL */ =20 diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 2aabe9affa0c..99474f160b86 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -214,7 +214,7 @@ static u32 intel_cpuid_vfm(void) =20 u32 intel_get_platform_id(void) { - unsigned int val[2]; + u64 val; =20 if (x86_hypervisor_present) return 0; @@ -229,9 +229,9 @@ u32 intel_get_platform_id(void) return 0; =20 /* get processor flags from MSR 0x17 */ - native_rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]); + val =3D native_rdmsrq(MSR_IA32_PLATFORM_ID); =20 - return (val[1] >> 18) & 7; + return (val >> 50) & 7; } =20 static void early_init_intel(struct cpuinfo_x86 *c) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/micr= ocode/amd.c index 6cdc410e7547..f6dc79dd18dd 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -315,7 +315,7 @@ static union cpuid_1_eax ucode_rev_to_cpuid(unsigned in= t val) =20 static u32 get_patch_level(void) { - u32 rev, dummy __always_unused; + u32 rev; =20 if (IS_ENABLED(CONFIG_MICROCODE_DBG) && x86_hypervisor_present) { int cpu =3D smp_processor_id(); @@ -332,7 +332,7 @@ static u32 get_patch_level(void) return microcode_rev[cpu]; } =20 - native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); + rev =3D native_rdmsrq(MSR_AMD64_PATCH_LEVEL); if (!rev) { if (x86_family(bsp_cpuid_1_eax) < 0x17) return rev; diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/mic= rocode/core.c index 0dd0c7241c57..ea696a202c31 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -94,13 +94,13 @@ struct early_load_data early_data; */ static bool amd_check_current_patch_level(void) { - u32 lvl, dummy, i; + u32 lvl, i; u32 *levels; =20 if (x86_cpuid_vendor() !=3D X86_VENDOR_AMD) return false; =20 - native_rdmsr(MSR_AMD64_PATCH_LEVEL, lvl, dummy); + lvl =3D native_rdmsrq(MSR_AMD64_PATCH_LEVEL); =20 levels =3D final_levels; =20 --=20 2.55.0 From nobody Fri Sep 25 14:31:21 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D0AA3F0AAD for ; Fri, 11 Sep 2026 07:52:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113174; cv=none; b=rX37/EaXjp6hPk38VjcItykhMYkuJ/FEtbSYSslToo4uAVZkgCs+k9g0lORHulEge8EsQCqAtplynVO4YwETQZrIKJMDPSTgW4SldpYBMcfQUTECtnPQQV5IIBSIDA9BiJ9jn/G1sQJ1cja9CA6IbZZF+mZYfV9kJO4jeTjBTyk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113174; c=relaxed/simple; bh=8Iogk9KLodMF4GGMjy5vPpqbNzNgs7ak5plzwfUfoms=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dgpI7urq7CavJMHGlXkHZV5WZJSp7thTxI4N+J3OcbBDX1cIok68NdAqw0I2XMkFiYeB6bFPRXhIvluUTAX8QQYtKNLSEaLYdFzX8QerDA/Wj12lf6mTYm1rq+7Tg1Y4SqFpdvk2V5eizTTcf6fnMGBWZnF7hWGdQvdEPGxAetg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=dLupT2YF; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=iJiY9HcU; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="dLupT2YF"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="iJiY9HcU" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5779D1FD61; Fri, 11 Sep 2026 07:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113166; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oZMupU525lLrXKAybBefTtO02qEIUgoa32p4Va8M9Oo=; b=dLupT2YF3LnBpmc3dJs6C7/77Ec3e0dxsSTL7JfzwjLxCQRtqlfgx5+ww3MmPWaasvli/k m40BRMww/R6Fu9R6JP3txGuisswOy8wdWAC7CGeUpTTjz3XCjpdCfAZE/Rsji+C30lXsL4 X/7ATMEoEna0ZdPaGCCaSsWUhtL13hI= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=iJiY9HcU DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113162; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oZMupU525lLrXKAybBefTtO02qEIUgoa32p4Va8M9Oo=; b=iJiY9HcUbv+HUGzlUlJ1r5PzebQE9QK7Z8GmLTp6XGIsf+uh1iJVeHbc8uw6iyUV0O+HGN fiCukdBwB4dWClltrXAizxMHxkP+dyx+XZH+et6tmSpmpPbpub1Iyw73nC6P7wpDDvWqDT sKYM7gTZw/Tx6ohW1o6e7+5fYaxw3gQ= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EED64136ED; Fri, 11 Sep 2026 07:52:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id sobnOEmzo2oaYAAAD6G6ig (envelope-from ); Fri, 11 Sep 2026 07:52:41 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v2 4/5] x86/msr: Remove native_rdmsr() Date: Fri, 11 Sep 2026 09:52:15 +0200 Message-ID: <20260911075216.3142309-5-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911075216.3142309-1-jgross@suse.com> References: <20260911075216.3142309-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Rspamd-Queue-Id: 5779D1FD61 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Level: X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; RCPT_COUNT_SEVEN(0.00)[8]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLkdkdrsxe9hqhhs5ask8616i6)]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:dkim,suse.com:email,suse.com:mid]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.com:+] X-Spam-Flag: NO Content-Type: text/plain; charset="utf-8" As native_rdmsr() has no users left, remove it. Signed-off-by: Juergen Gross --- arch/x86/include/asm/msr.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index bfad2b96a892..7bb5bf408fa6 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -83,13 +83,6 @@ static __always_inline void __wrmsrq(u32 msr, u64 val) : : "c" (msr), "a" ((u32)val), "d" ((u32)(val >> 32)) : "memory"); } =20 -#define native_rdmsr(msr, val1, val2) \ -do { \ - u64 __val =3D __rdmsr((msr)); \ - (void)((val1) =3D (u32)__val); \ - (void)((val2) =3D (u32)(__val >> 32)); \ -} while (0) - static __always_inline u64 native_rdmsrq(u32 msr) { return __rdmsr(msr); --=20 2.55.0 From nobody Fri Sep 25 14:31:21 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 292AB453A25 for ; Fri, 11 Sep 2026 07:52:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113179; cv=none; b=Zv1twLbxdMEWHho2qxvbid7M+jslB9HGPSA9RdWPxNSNAQP1NXWQwnw1BVhmvlz8Sxl8hRrFHqAxaE3+Ng6BtoGhQdzYTP04CNN5VxRrEaz9nAXT5f+L14hXawCWpexBmv+0ZCBcTHV0jnSkCIJo9Ruq3Y6pEH9lAc9rlftS4dA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789113179; c=relaxed/simple; bh=e090XTB4dKHKZm4Zq6/wgXMv7Sal9G3m0Ch+mz7Dc+A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mgYyvhXjG9flpW2iXb+aB6MdrTx1XBpmQAYcwQDUlDEskcAr0RBL1bIkwqhhX1tqrMdIR5b+w5zKO/3PVsIA348XBgnadlk11u4li4DKSJyill273zgskI0Vf0kp9MOaUFwulWQOL3VjI4nAECT0s3yFe5839ECpW1XG6FPHbyE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=pWh6v8XH; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=H0o27yPc; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="pWh6v8XH"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="H0o27yPc" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1566F21CAA; Fri, 11 Sep 2026 07:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113172; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=49cvmy5kfzS7XnLM3V5cF4E+2KSFFLx0PUqQvEkMqvQ=; b=pWh6v8XH/AKpDke5uGwOR3kFL6/FUE2zvwzfixkXEiQSvmhiqzELSwWnGAJzpbAKptHwRe P/wR8icPG5OJtnKdg89QD9oHOCzkIc++qYe7usrMGc8D0/Q6HHjXtVyu+0EaVwwkscD3mH iNFD+4Yit3gE14ggMq/SeO8i8rGNOM8= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=H0o27yPc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1789113168; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=49cvmy5kfzS7XnLM3V5cF4E+2KSFFLx0PUqQvEkMqvQ=; b=H0o27yPc4ALFmUjsCm1AGYA+yxAd142sHB6Uy6WLFbv/laykjI6bz8dmL+Togi5UJAS3tE 4qS0oa3c6T5fDgi6efxqEsAKD6r9AhTdOcP50iZj+UuO1ZkJ7uHHQnZN4leqnm+Lt4RyQI id7/xMDQ+EuBPMPDO1cqtCijAu3gyGo= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A3E6013715; Fri, 11 Sep 2026 07:52:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id ih68Jk+zo2qhYAAAD6G6ig (envelope-from ); Fri, 11 Sep 2026 07:52:47 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v2 5/5] x86/msr: Switch native_wrmsrq() from macro to inline function Date: Fri, 11 Sep 2026 09:52:16 +0200 Message-ID: <20260911075216.3142309-6-jgross@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911075216.3142309-1-jgross@suse.com> References: <20260911075216.3142309-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Rspamd-Queue-Id: 1566F21CAA X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Level: X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[suse.com:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_SEVEN(0.00)[8]; R_RATELIMIT(0.00)[to_ip_from(RLkdkdrsxe9hqhhs5ask8616i6)]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:dkim,suse.com:email,suse.com:mid] X-Spam-Flag: NO Content-Type: text/plain; charset="utf-8" Make native_wrmsrq() an inline function. Signed-off-by: Juergen Gross --- arch/x86/include/asm/msr.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 7bb5bf408fa6..3b33d432bc24 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -88,8 +88,10 @@ static __always_inline u64 native_rdmsrq(u32 msr) return __rdmsr(msr); } =20 -#define native_wrmsrq(msr, val) \ - __wrmsrq((msr), (val)) +static __always_inline void native_wrmsrq(u32 msr, u64 val) +{ + __wrmsrq(msr, val); +} =20 static inline u64 native_read_msr(u32 msr) { --=20 2.55.0