On Wed, Sep 25, 2024 at 08:07:36AM -0700, Ricardo Neri wrote: > From: Sumeet Pawnikar <sumeet.r.pawnikar@xxxxxxxxx> > > [ Upstream commit d05b5e0baf424c8c4b4709ac11f66ab726c8deaf ] > > The current initialization of the struct x86_cpu_id via > pl4_support_ids[] is partial and wrong. It is initializing > "stepping" field with "X86_FEATURE_ANY" instead of "feature" field. > > Use X86_MATCH_INTEL_FAM6_MODEL macro instead of initializing > each field of the struct x86_cpu_id for pl4_supported list of CPUs. > This X86_MATCH_INTEL_FAM6_MODEL macro internally uses another macro > X86_MATCH_VENDOR_FAM_MODEL_FEATURE for X86 based CPU matching with > appropriate initialized values. > > Reported-by: Dave Hansen <dave.hansen@xxxxxxxxx> > Link: https://lore.kernel.org/lkml/28ead36b-2d9e-1a36-6f4e-04684e420260@xxxxxxxxx > Fixes: eb52bc2ae5b8 ("powercap: RAPL: Add Power Limit4 support for Meteor Lake SoC") > Fixes: b08b95cf30f5 ("powercap: RAPL: Add Power Limit4 support for Alder Lake-N and Raptor Lake-P") > Fixes: 515755906921 ("powercap: RAPL: Add Power Limit4 support for RaptorLake") > Fixes: 1cc5b9a411e4 ("powercap: Add Power Limit4 support for Alder Lake SoC") > Fixes: 8365a898fe53 ("powercap: Add Power Limit4 support") > Signed-off-by: Sumeet Pawnikar <sumeet.r.pawnikar@xxxxxxxxx> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > [ Ricardo: I removed METEORLAKE and METEORLAKE_L from pl4_support_ids as > they are not included in v6.1. ] > Signed-off-by: Ricardo Neri <ricardo.neri-calderon@xxxxxxxxxxxxxxx> Reviewed-by: Pawan Gupta <pawan.kumar.gupta@xxxxxxxxxxxxxxx>