| Message ID | 20230601004706.871528-1-xi.pardee@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/x86:intel/pmc: Remove Meteor Lake S platform support | expand |
Hi, On 6/1/23 02:47, Xi Pardee wrote: > commit c5ad454a12c6 ("platform/x86: intel/pmc/core: Add Meteor Lake > support to pmc core driver") was supposed to add support for Meter > Lake P/M and mistakenly added support for Meteor Lake S instead. Meteor > Lake P/M support was added later and MTL-S support needs to be removed > since its currently assigned to the wrong register maps. > > Fixes: c5ad454a12c6 ("platform/x86: intel/pmc/core: Add Meteor Lake support to pmc core driver") > Signed-off-by: Xi Pardee <xi.pardee@intel.com> > Signed-off-by: David E. Box <david.e.box@linux.intel.com> Thank you for your patch, I've applied this patch to my review-hans branch: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while. Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window. Regards, Hans > --- > drivers/platform/x86/intel/pmc/core.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c > index da6e7206d38b..b8711330e411 100644 > --- a/drivers/platform/x86/intel/pmc/core.c > +++ b/drivers/platform/x86/intel/pmc/core.c > @@ -1039,7 +1039,6 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { > X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, tgl_core_init), > X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, adl_core_init), > X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, adl_core_init), > - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, mtl_core_init), > X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, mtl_core_init), > {} > };
diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index da6e7206d38b..b8711330e411 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -1039,7 +1039,6 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, tgl_core_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, adl_core_init), X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, adl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, mtl_core_init), X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, mtl_core_init), {} };
commit c5ad454a12c6 ("platform/x86: intel/pmc/core: Add Meteor Lake support to pmc core driver") was supposed to add support for Meter Lake P/M and mistakenly added support for Meteor Lake S instead. Meteor Lake P/M support was added later and MTL-S support needs to be removed since its currently assigned to the wrong register maps. Fixes: c5ad454a12c6 ("platform/x86: intel/pmc/core: Add Meteor Lake support to pmc core driver") Signed-off-by: Xi Pardee <xi.pardee@intel.com> Signed-off-by: David E. Box <david.e.box@linux.intel.com> --- drivers/platform/x86/intel/pmc/core.c | 1 - 1 file changed, 1 deletion(-)