From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 F1207131BB1 for ; Thu, 28 Mar 2024 16:28:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711643322; cv=none; b=pIHv/nfdA/m9igqJnJYeDV39v6nCfJpwNN+6lWAcsUTrw7JYKShCvnMiw5h002DQtYh8zeIkATXiuQNfmaFi9Vh/HeSaPrulr+gSXNCNoJgNkwpWId0vOx/0eS3i6DrX4pEiXIVtZO4M0hBuEIi/c/cn+E8b6AL91NlOQ4a0dkw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711643322; c=relaxed/simple; bh=KWWRdUU5f5jfluH+XjQDN6u50z+YdtCCFs2TFHrBnZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rNBzt6ZY+UzR18Zvfymz1mySZgR5cH719uP8f6Ll8cIeXJzXc3+JpfRsaFFhBhduF0jZjdlZYmu4JnGreqGrG/p9vmJ9+J6zdJIgCvhDjC5DEqSdnXLNynPfKIKbusXj4KnAgNwepwL0pkB4KmUG7usdnE4Y5Dg+/vE20DeqnX0= 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=oFi3tlkj; arc=none smtp.client-ip=192.198.163.8 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="oFi3tlkj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711643319; x=1743179319; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KWWRdUU5f5jfluH+XjQDN6u50z+YdtCCFs2TFHrBnZg=; b=oFi3tlkjFtgDhy0I9EOEY+7bvJiIICBEm0YpiqkQjZhjIc0+jCCdy28X vRZB0eWh2Uelq+Mx9X6yno9LqZ6/E1HEjiv/i81IaUU8DYBhPlUCKIN5E j2KLYSfHq2OtcfGPWTLDNsmm3eTkmTV405T7K6aTdIzgSSQ5SrMIcXw69 1G+/xFAPFDE9Q43oJ/rqEqMk7PowkJNCWF4stcwxaEjh6waGUFO9m+5aG Xa47RYgpkfdkMXegTQwiFyDDIjMgQOlDygPKyf4T298dk0/mvUeFwabJQ 8om6LIk2YKcs9L3Qp3vdEk7Jp09LxXVHaJpXXJo+1YXN1hCOvFXUKc4At g==; X-CSE-ConnectionGUID: NT9JQepuSAa5Bgby9OevPA== X-CSE-MsgGUID: bEk6FFLST/GIgMgTV9TB3g== X-IronPort-AV: E=McAfee;i="6600,9927,11027"; a="24294803" X-IronPort-AV: E=Sophos;i="6.07,162,1708416000"; d="scan'208";a="24294803" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 09:28:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,162,1708416000"; d="scan'208";a="16726184" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 09:28:24 -0700 From: Tony Luck To: patches@lists.linux.dev Cc: Tony Luck Subject: [PATCH 69/74] x86/cpu/vfm: Update arch/x86/platform/atom/punit_atom_debug.c Date: Thu, 28 Mar 2024 09:28:03 -0700 Message-ID: <20240328162820.242778-69-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240328090459.242500-tony.luck@intel.com> References: <20240328090459.242500-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.44.0