From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.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 CD67D1836C5 for ; Wed, 24 Apr 2024 18:15:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982527; cv=none; b=nCFv2VtyORIafwP6EdOvcAFT2ccvScOxwFbWVpEtSQKzJh/bQtEd03SQPEFeAewkHoyEbYEQ94AGW/pPALYjfj3ifJ1jdPWUFBNWaig8F/sB5bi/FU7sM+bjbNXGLYWWqyzELucZ/grtNbwLEdWy98pIX358Yo50P5Zki0UYmD4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982527; c=relaxed/simple; bh=xXGsSwUGJv8u8+15mKqC9kFQ7leMnNCPWaElrpBEOfk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bDabhdGd5JKnh/rV7EelTJoFuSEdR3Sb/ehVAAW8K6sUhLTbxT2JsbwxyPpqfxEWumehmHcr8WehQpbLxq9fWwM4RkbKo2Wuw9XnY6fPs1drUBWm1PUSyACJ/HlwFARBLyutUoSmsQniuFDuuIXluT3RNj7xXWdjzMzh+cj6rEc= 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=id1qg/F6; arc=none smtp.client-ip=192.198.163.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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="id1qg/F6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982524; x=1745518524; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xXGsSwUGJv8u8+15mKqC9kFQ7leMnNCPWaElrpBEOfk=; b=id1qg/F6NufbDDHrN58fsA/eD8lG2CQySPEevQqum6vlx/Ev3+Jr3Ey5 3JNG67qHNlEH8buVbDdpRyT46PV/cvQtC+OuaPsG9qqd1xet6xXb0IGmx xJL2zGqJ7EJ3glEk7ZVAwUkutRvXGudMFw53wrdh1ak7ZSlqWuA1eU3E/ hNkB7Vmh8BtNQNVFZMavH13pMJr2O8J3Ms9RUSKzZKx8RYxcRMUQO7nnY oMMettY9aK5yH4P56aHSOsZER5dUtmjd2urDb3Gmoynw0E49Z/h4HQV23 S8PHdp1BU6UPM30+xpV/waC4TgmgaBGFIcVWACoY3MxPCHCBxDLHOcAPQ g==; X-CSE-ConnectionGUID: FFnIjcaaThC6fFr7Dye+jg== X-CSE-MsgGUID: +/fDce02RnKSyJ/me9FnfA== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503572" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503572" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:24 -0700 X-CSE-ConnectionGUID: lqZRJDaJRBO/QzC/dCURfQ== X-CSE-MsgGUID: f/4exrcAQseUlbm3R5Sj6A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750149" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:24 -0700 From: Tony Luck To: Borislav Petkov , Thomas Gleixner , Ingo Molnar , Dave Hansen , x86@kernel.org Cc: "H. Peter Anvin" , Andy Shevchenko , Tony Luck , linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v4 45/71] x86/platform/intel-mid: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:23 -0700 Message-ID: <20240424181523.42023-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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 --- arch/x86/platform/intel-mid/intel-mid.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c index 7be71c2cdc83..8b8173fb0a43 100644 --- a/arch/x86/platform/intel-mid/intel-mid.c +++ b/arch/x86/platform/intel-mid/intel-mid.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -55,9 +56,9 @@ static void __init intel_mid_time_init(void) static void intel_mid_arch_setup(void) { - switch (boot_cpu_data.x86_model) { - case 0x3C: - case 0x4A: + switch (boot_cpu_data.x86_vfm) { + case INTEL_HASWELL: + case INTEL_ATOM_SILVERMONT_MID: x86_platform.legacy.rtc = 1; break; default: -- 2.44.0