Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp2173483lqa; Tue, 30 Apr 2024 09:56:27 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVLiYTtRrfDd8asVmBUzzZLR8YS38eIY8A1yW2sgz0ZbESW3vW7qxjN2xVYDAteY8G+62q/HYDqrbNlUG43sABcAFbYWMkkTfm+1UY9TA== X-Google-Smtp-Source: AGHT+IFgci3awQQzSAJcw5t28Ho4pihyhwidUUMdiW31FlreZ6+yrKuxsX3yFlbEd5JnxpuIcimX X-Received: by 2002:a05:622a:1b1a:b0:43a:d386:f8d8 with SMTP id bb26-20020a05622a1b1a00b0043ad386f8d8mr9409770qtb.21.1714496187304; Tue, 30 Apr 2024 09:56:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714496187; cv=pass; d=google.com; s=arc-20160816; b=TO6f00w+aV20iFSaPtRFmAU9EPR3L3bX0S76pwlTvEqjRfmMAnnq3f05780PI+TzO+ u0TuZ1c9l/IUVALJX1cfR5j7K3D83nB0QaIcet7m7B+p5mFdjPW+NEqh0Pml6FHbD22p 9OcwiIDmR4xuhsH4Wz0qFzVCi88C0Ttl0O6xNd3PIwgDbJp8ae8qZEnCF0qUO3GwHu6i yy5/1/Lli9jbcp1HRvR1LeT2HUT/NDL6LzOwBdZkdskMJ5mxfZEl/MqEywqz3jUydp/h MfBUlUyLELP2YL1NSP7Kymvdh7niyTPhjCb6eoPkxDRTKlxg2ejTgD63vRq8lsVqQlwz jFkg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=jGawV9b3qm4d6CquCfXjPxgpYVdXkqKtba0Q4T5PTgM=; fh=fCCNFvJbPqqXo45yXdlgqaDimb/JVSzwDZSVTcpWFog=; b=SRTTPVJZ2M8vrt4syMbxcETH0Sg9wJzTlg+S2aqDESe9AAaXMGkbfqjwFXkpiPle7I Kw9CiWpZP3R804mmzJ8XX4CmVB28ngOaLPqkkBsnR/Qg9hLUBwuSezQhdMZvRu9VK7Jw FTJeq0l8usB6yPn7lUlxjfdT9Xfjd77+Z1oWhQ7UX5rwNRjVVnvmgG8fVZYHEkXnm/if cJPrOe/orDP6cOXqISU4CQbp3xKUnrWKH7I2qGkFb2Fq9CUCmqSR7wap1tEdO/IEcdbu hDXlH7ffFYo8Rv0/GG6bhYcvgM2T9s1xo8OfIUo7kZjYEf+5eKy10pNRNIMJkU4kl6aw Kxug==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V0kh7Pjx; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-164459-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-164459-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id w22-20020ac857d6000000b0043acbc10181si6319404qta.182.2024.04.30.09.56.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 09:56:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-164459-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V0kh7Pjx; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-164459-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-164459-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com 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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 0C1B01C23BFF for ; Tue, 30 Apr 2024 16:56:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 740121C8FC1; Tue, 30 Apr 2024 16:51:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="V0kh7Pjx" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 3691C1C232B for ; Tue, 30 Apr 2024 16:51:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495910; cv=none; b=S9X3dIh+euNEhumPOrnFpTcKNSVyD8PLjeFEBVtWEn/HPajUMLtpugbGJ74rk2x3bGFtaKnbzpmhUcEhZsBUdphi6nko4jgnfc1qRtqAlpV3o2CHI4dp840DzCbin4+NfMBNp0heK7XZWu+dw7+UCA67OGDjF3KZEuuh49bxOhQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495910; c=relaxed/simple; bh=WV3qnx6+50b42Jf/GqLJUpAXvV6x1yHw3SQJ/gD5Xpk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o8mE9huIAoKUwawjaO5ZMbBd2KWfB+cUk4UrSrWgJO9anjZ0dWrN6JScabX8SsGrEkvlPPl7XBRQJIzafdo6IgtBK4le8aoFoy5qNUwdVJCvkCIy//yooU22eeCGW3vrTIfOqcXkhFaPdpv+OwSWDQ7PClR/2l8TO2p15rDFySA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=V0kh7Pjx; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714495908; x=1746031908; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WV3qnx6+50b42Jf/GqLJUpAXvV6x1yHw3SQJ/gD5Xpk=; b=V0kh7PjxeZjmH91ALRrlnT8mZxYDOOPMxEQ8ORFMFM0PSqzWBBaQ2VHi XyB1nv0nN7PF64/lqssw3rDPW6QqLVlrdopFsvOEUX2rS0Eg+YVMCj6wm x/HUUNeOdwyHm5rNncKXui6mi5xz9G3slsjrNO2pfGEslOrtO1mGrZ24s 4b9G9q1dF5RriSAUDuerI8r79p0sbu03uaKPt1huaK9l6gCJRrT/BDkrp FFCoIZt6hwH1w5G3Ou2kuvJJal7aBbiNtbrYpj5gQqefCPxEmm+9E3CsD JULL3gG5ncdQjm/StftCDR6TPBBPq9BnEuEu5ICUQpimwtW1QfvGSGuxs A==; X-CSE-ConnectionGUID: xyFknuFaSXetYnZofsFqDQ== X-CSE-MsgGUID: 5inlzQn5TvWXFfdxCgC2Bg== X-IronPort-AV: E=McAfee;i="6600,9927,11060"; a="10075777" X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="10075777" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 09:51:23 -0700 X-CSE-ConnectionGUID: UtJUUPUgQoeMnAiBNcUzog== X-CSE-MsgGUID: 8F0oLzPiQDmNnewkKjSlqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="26515507" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 09:51:19 -0700 From: Tony Luck To: Borislav Petkov Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v5 36/47] EDAC/skx: Switch to new Intel CPU model defines Date: Tue, 30 Apr 2024 09:50:49 -0700 Message-ID: <20240430165100.73491-36-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430165100.73491-1-tony.luck@intel.com> References: <20240430164913.73473-1-tony.luck@intel.com> <20240430165100.73491-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/edac/skx_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/edac/skx_base.c b/drivers/edac/skx_base.c index 0a862336a7ce..af3fa807acdb 100644 --- a/drivers/edac/skx_base.c +++ b/drivers/edac/skx_base.c @@ -164,7 +164,7 @@ static struct res_config skx_cfg = { }; static const struct x86_cpu_id skx_cpuids[] = { - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x0, 0xf), &skx_cfg), + X86_MATCH_VFM_STEPPINGS(INTEL_SKYLAKE_X, X86_STEPPINGS(0x0, 0xf), &skx_cfg), { } }; MODULE_DEVICE_TABLE(x86cpu, skx_cpuids); -- 2.44.0