From patchwork Tue Feb 11 19:44:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sohil Mehta X-Patchwork-Id: 865722 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 3A17026B2AC; Tue, 11 Feb 2025 19:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739303204; cv=none; b=EDyAsPt1KLBrKVEv8GPFWL/3KX4AAIKV2oCUMvjMxKno908eJIoBWs7Jh4ATsKDHEnCqGDmEw6NFl6IDWG8JqA7mvdd2zwnQfuNB0VCQdS5lMrjrI6Q6dfotc7Q/OYYVk/4whlbRpiPW9PQNrZtJb2mCyUbtqnJfkB9JEqI637M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739303204; c=relaxed/simple; bh=DQwsDRYYrr2LZYYckCXDgcjmwkOtY0NcULIdRKXH9mQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L3B0RmixylSIA5UZo0AVam5mx6qSO9+D1Es6gnMgXCDaW4LSW7gelNaw3l73KV2UgUo079QLm6JAKNlLu2IH7eIGnDKnjC0FNTtxsyoBgEzfGS/noyQEd8PRbwWOJZYOIBnNF4wUq0i5nneBcbwulLCYxAIcbF5LSbVJekRBki0= 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=eLHt9ppD; arc=none smtp.client-ip=198.175.65.21 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="eLHt9ppD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739303203; x=1770839203; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DQwsDRYYrr2LZYYckCXDgcjmwkOtY0NcULIdRKXH9mQ=; b=eLHt9ppDWIofwTI/lHNugJzmHlhzWnXXjFVW7Emr4KzKWLTY87ozG7PO 7uHGwXVA4YLTeCLTukmM0uUYa4YB1C7wTkISO8rJvVnauOb7jfOjJFyG7 rveOoMp3uaVUFqJy9kyoKnlfAbelLkwjhqj3pBmMHxtnJh8NsFkyRmVVS Lq2IfPbudK1IMXrGP9nyOA+781z3aqYF2e1BlZKzgWs1xfs8bjid+BF+6 +NOvmB8QfDTSVIs9hzzRqUg6+oUp4knXytgCP6A4DVM6LCesvl2Swcgm9 1PqIMBXFL3o2LxumxMLvVcJndji0k4h6TGq6sQLYm7zgm1b1npTbkI24/ A==; X-CSE-ConnectionGUID: VHL467KWRL+KuSqf3oMG2g== X-CSE-MsgGUID: lUn8LA1fSpK+XJwmhAMtcw== X-IronPort-AV: E=McAfee;i="6700,10204,11342"; a="39855043" X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="39855043" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 11:46:37 -0800 X-CSE-ConnectionGUID: NhdnOQf9TjKVdH141SRtvg== X-CSE-MsgGUID: tzy2/R7sSESU1esiHFRL0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="143519318" Received: from sohilmeh.sc.intel.com ([172.25.103.65]) by fmviesa001.fm.intel.com with ESMTP; 11 Feb 2025 11:46:37 -0800 From: Sohil Mehta To: x86@kernel.org, Dave Hansen , Tony Luck Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Thomas Gleixner , Borislav Petkov , "H . Peter Anvin" , "Rafael J . Wysocki" , Len Brown , Andy Lutomirski , Viresh Kumar , Fenghua Yu , Jean Delvare , Guenter Roeck , Zhang Rui , Andrew Cooper , David Laight , Sohil Mehta , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-hwmon@vger.kernel.org Subject: [PATCH v2 17/17] perf/x86/p4: Replace Pentium 4 model checks with VFM ones Date: Tue, 11 Feb 2025 19:44:07 +0000 Message-ID: <20250211194407.2577252-18-sohil.mehta@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250211194407.2577252-1-sohil.mehta@intel.com> References: <20250211194407.2577252-1-sohil.mehta@intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Introduce names for some old pentium 4 models and replace x86_model checks with VFM ones. Signed-off-by: Sohil Mehta --- v2: No change. --- arch/x86/events/intel/p4.c | 7 ++++--- arch/x86/include/asm/intel-family.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/intel/p4.c b/arch/x86/events/intel/p4.c index 844bc4fc4724..fb726c6fc6e7 100644 --- a/arch/x86/events/intel/p4.c +++ b/arch/x86/events/intel/p4.c @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -732,9 +733,9 @@ static bool p4_event_match_cpu_model(unsigned int event_idx) { /* INSTR_COMPLETED event only exist for model 3, 4, 6 (Prescott) */ if (event_idx == P4_EVENT_INSTR_COMPLETED) { - if (boot_cpu_data.x86_model != 3 && - boot_cpu_data.x86_model != 4 && - boot_cpu_data.x86_model != 6) + if (boot_cpu_data.x86_vfm != INTEL_P4_PRESCOTT && + boot_cpu_data.x86_vfm != INTEL_P4_PRESCOTT_2M && + boot_cpu_data.x86_vfm != INTEL_P4_CEDARMILL) return false; } diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index fae52a15d9b9..af2979850d62 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -193,6 +193,7 @@ /* Family 15 - NetBurst */ #define INTEL_P4_WILLAMETTE IFM(15, 0x01) /* Also Xeon Foster */ #define INTEL_P4_PRESCOTT IFM(15, 0x03) +#define INTEL_P4_PRESCOTT_2M IFM(15, 0x04) #define INTEL_P4_CEDARMILL IFM(15, 0x06) /* Also Xeon Dempsey */ /* Family 19 */