Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp1229756lqa; Mon, 29 Apr 2024 02:04:03 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWo+f11H7pIkU+SWX5qOrRhWkSVlX/vIi89BhmwpRc+JpTLM1AGu/OqoPHZhZajOHUZDXBmXeZk3u8O2PfAMCdeWo78oHlpRCb9JQUYRg== X-Google-Smtp-Source: AGHT+IG15UWXe2wOUKppZg/fMxT/SuKVRtrKVyoGPtL36Ic/wf4PNq44U9X6ZC1B0/CzNFQGAoV0 X-Received: by 2002:a50:ee03:0:b0:572:7d4f:5061 with SMTP id g3-20020a50ee03000000b005727d4f5061mr2081748eds.15.1714381442837; Mon, 29 Apr 2024 02:04:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714381442; cv=pass; d=google.com; s=arc-20160816; b=Iq+DadaBUyHXQe5LiP87Lydgcd6eJvgDooYrOaO8wZ4/YcajB5zSKoE8JoaF0ZQokw u5W+QFbIiirJ4VnHxYpx7TH6bhk9yGTWI9Lvs0RvUFmYrekJodOMrUs2lb3fxy3+PsCj hUVUwKf5L8Js2bklT7D330VI55OReTfwgtb2zLIGdEH4TmWCSDeMEhMibNzssdBn2I04 vQ41nrjU/VzLfRdfFyKXEZ7s2FjYWbFzmynvuC0urlj9svrhB1sdGRYfcFISipfZQ+QG FIhBD53sZhIRpeapLDFlAwRvR0uBRjyZ+nNUg8b4xrDAlxFWfMY4WXCLTCnrUOuvAU+S ZDgg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:cc:subject:to:reply-to:sender:from:dkim-signature :dkim-signature:date; bh=lm2DDrCSYYnyCQ3ZBAlGvUoNcQKS5sIb24sdik9EYBM=; fh=JTk9+qr5gpUHTA82NAoTC2Dn364LtWPF0bcXdXoFHrA=; b=yRLi3jCfY8K6m55i6TV0YFPt3x451ZREHHa6Wsg4f1/uAbCcRW6+ktVH9mieRYLKYW yCr1s76ahnE3TWyu90eilxEwTKYdfSVzxWd42xJ1SN2qz44/WvvZh/kcEc0NhaGVutf4 cHfy4Mo4HYhAGSo2ka3swICB9h0GspDFCo8VyjgIyhyYR06+uKFIrShdajSyuJuAqDQk SYfnF2+qq28Gg+e4PUYJ9dvu1DRjiCxG/Gz94HaMmnz9BLqo1lylx7LocV51MAIRNvoU rqZkhMzMuPvutoRhH0dY5R+/cAyGLmxIMcubF7rp+dPlTFDPZ5eUP3GpRhJI/GTpTfBh qBsQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=UVQwLACo; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-161954-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-161954-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id r1-20020a50aac1000000b00571b67239f2si14086093edc.523.2024.04.29.02.04.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 02:04:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-161954-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=UVQwLACo; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-161954-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-161954-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 90E361F21849 for ; Mon, 29 Apr 2024 09:04:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B97D941AAC; Mon, 29 Apr 2024 09:02:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="UVQwLACo"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="erzPJ3fE" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49EB028374; Mon, 29 Apr 2024 09:02:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714381327; cv=none; b=JneAY3PpdaLfXc/yNtm3yD8/DGb7EV1eRITfYXiFuCnt6siTI0cBkROCB2Bl9GNe8cZRg8vzapJWsbxi9EbVmSXvajvw1tgRhrZ9ik276MQ+m3/3RblKMX+c7h1TWEYECiyLA2KsJ8PPSs0gzks6qwNQIEeT6cuJWAqfhScYdRY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714381327; c=relaxed/simple; bh=FNu4OZDpaifaqU1UAM6Hvf2ci30vtleDRMjd/58y1gY=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=VjNtekctWSinq4W1kneonhD5NHHxoAi0+5v8N23PDjZND2KMJwaQt6LM7leVvWQ0NCy6XbDnsE//oQMCAdN5Tlbmk4j2T8HKuap2XYZjf4+shrc6PprGrw8Dr87THQxQHlQiOQFu2BPaS6yHHiQx8l73wSn9nGDiYKvfOW+g8tw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=UVQwLACo; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=erzPJ3fE; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Mon, 29 Apr 2024 09:01:54 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1714381315; 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=lm2DDrCSYYnyCQ3ZBAlGvUoNcQKS5sIb24sdik9EYBM=; b=UVQwLACo+pwFvvaeknxVydOmlNjGcnOkkYiV/xaTPOXB0pWgUobHj5Ww76NpFejGRmt561 uMs8VjS3iRMbsuzTr+TD60ZTpqmaqy/5VSnfHmBJcZxJUlstOoOch+LfdMaTI17bl/M52B z2W16rHF6vPamuBWDooZ/XhBVoL8BYqvYgFI+2qt6ArkUHzIoNH7pQIQtjMEIJ6G1J4BSz scZiz+nwniNSJ5r4TeWIY3sT463yYzNhAannBuxRoEj7gKCmHJMj+TTVOFSV7pYFgmR0VM n3MCwvuNSoGtmizNSILPMGZ1VwDR0YOMZ5pGciOdM4TwdcZf4RB7LZ3PzSFjkg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1714381315; 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=lm2DDrCSYYnyCQ3ZBAlGvUoNcQKS5sIb24sdik9EYBM=; b=erzPJ3fE0BSU3hJiPfiIM0PRWl02XNZ4anhlLjNFpjSSaiPw+te/61Nqb7Z8s357TyPiUQ +ZwZ3pDsIrHtw5Cw== From: "tip-bot2 for Tony Luck" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/cpu: Switch to new Intel CPU model defines Cc: Tony Luck , Dave Hansen , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171438131471.10875.12730208932991816010.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit The following commit has been merged into the x86/cpu branch of tip: Commit-ID: c73cd372210343b271159eab0bdc95820e5e7b86 Gitweb: https://git.kernel.org/tip/c73cd372210343b271159eab0bdc95820e5e7b86 Author: Tony Luck AuthorDate: Wed, 24 Apr 2024 11:15:11 -07:00 Committer: Borislav Petkov (AMD) CommitterDate: Mon, 29 Apr 2024 10:31:19 +02:00 x86/cpu: Switch to new Intel CPU model defines New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Signed-off-by: Dave Hansen Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/all/20240424181511.41753-1-tony.luck%40intel.com --- arch/x86/kernel/cpu/match.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c index 2243083..8651643 100644 --- a/arch/x86/kernel/cpu/match.c +++ b/arch/x86/kernel/cpu/match.c @@ -25,7 +25,7 @@ * asm/cpu_device_id.h contains a set of useful macros which are shortcuts * for various common selections. The above can be shortened to: * - * X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, NULL); + * X86_MATCH_VFM(INTEL_BROADWELL, NULL); * * Arrays used to match for this should also be declared using * MODULE_DEVICE_TABLE(x86cpu, ...)