From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 1913413BC1A for ; Mon, 20 May 2024 22:46:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245211; cv=none; b=FHpRAN7jYWMHqXxfa+ZmN8CbCGez+Gf4FY+0Zx5U5IUPmwyXCne5R0UvLmb7oOJxcN0z2F34k0sSaZlhcNNGvYxSrDVILKPL7IEQPaWgWQLQUSMTZueTzmdAmLHvOAKSFWC5dHHadQyqr7nxjV27oZ8KiMsJip7HRlh5DokRO/Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245211; c=relaxed/simple; bh=fYJHYz8V9kimHRbxD5uVEAotpDMXkQsRHlaEWk/P2XA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PazPFRH5pfyj8GDBqTzelrU2YS3FSvb/A21AQH5pWAVzQPbGdm5d3qqwNYbGIjDJb776FeqeffjeNjqpaKOENGVC1pK+l+fho3fSe+pRLdlhn6HnZp9nzXKF+ztOLHN+MeiUbcSbNZrP8uaPpCn3chznuK9LO2czLUvaSAJ2gt4= 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=ihjsooDL; arc=none smtp.client-ip=192.198.163.18 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="ihjsooDL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716245209; x=1747781209; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fYJHYz8V9kimHRbxD5uVEAotpDMXkQsRHlaEWk/P2XA=; b=ihjsooDLSD8KO2j1EfARj+tLPF2VSLAJULfHCwajQOGh41KmcfxDXTfi dLKR6pDm2v/NZG5j1w0tdtTc31i9IdMDPMAH4fdOih+fQiodROrzP/0jw IAnItdCz47EdIhr8yfY/Q4ftBX/lloIqXdqCrvWNubZtY9+gxJZZNrdkO WU16tHvtsPjz/KETjhJcc8EZZt5OoIAfloIllUcOhepXK9Z5FAjJhkvwp TTD816ZlAYaQqOyX48aH7uTmvXv0Zu65kYQJXnZupJ8kvkDxfI4G2mNpM swikX2F34h3lEm+5A7zhYI9Lf0vpxYJGVO81SIxMoqZJu/X1GlLLiNx4f A==; X-CSE-ConnectionGUID: Ik8rNIE6RUGyB6k92+y9iA== X-CSE-MsgGUID: xhSdfyNDRXqb/EUd5yY6Iw== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12199857" X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="12199857" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 15:46:39 -0700 X-CSE-ConnectionGUID: UK2mgWJFRYS6AmhMecX+Iw== X-CSE-MsgGUID: ElbWYlQcQlKP46GzimvXLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="32593479" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 15:46:39 -0700 From: Tony Luck To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "H. Peter Anvin" , "Peter Zijlstra (Intel)" , Uros Bizjak , Rick Edgecombe , Arnd Bergmann , Tony Luck , Mateusz Guzik , Thomas Renninger , Andi Kleen , linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v6 32/49] x86/platform/atom: Switch to new Intel CPU model defines Date: Mon, 20 May 2024 15:46:03 -0700 Message-ID: <20240520224620.9480-33-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240520224620.9480-1-tony.luck@intel.com> References: <20240520224620.9480-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/atom/punit_atom_debug.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/platform/atom/punit_atom_debug.c b/arch/x86/platform/atom/punit_atom_debug.c index 6b9c6deca8ba..44c30ce6360a 100644 --- a/arch/x86/platform/atom/punit_atom_debug.c +++ b/arch/x86/platform/atom/punit_atom_debug.c @@ -165,14 +165,13 @@ static void punit_s2idle_check_register(struct punit_device *punit_device) {} static void punit_s2idle_check_unregister(void) {} #endif -#define X86_MATCH(model, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \ - X86_FEATURE_MWAIT, data) +#define X86_MATCH(vfm, data) \ + X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_MWAIT, data) static const struct x86_cpu_id intel_punit_cpu_ids[] = { - X86_MATCH(ATOM_SILVERMONT, &punit_device_byt), - X86_MATCH(ATOM_SILVERMONT_MID, &punit_device_tng), - X86_MATCH(ATOM_AIRMONT, &punit_device_cht), + X86_MATCH(INTEL_ATOM_SILVERMONT, &punit_device_byt), + X86_MATCH(INTEL_ATOM_SILVERMONT_MID, &punit_device_tng), + X86_MATCH(INTEL_ATOM_AIRMONT, &punit_device_cht), {} }; MODULE_DEVICE_TABLE(x86cpu, intel_punit_cpu_ids); -- 2.45.0