Commit 2a61f706 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jia, Yingbao
Browse files

platform/x86/intel-uncore-freq: Increase minor number support 

mainline inclusion
from mainline-v6.9
commit bc774d46b41482534c7ba92f6342ca0a355c13af
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QCV
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bc774d46b41482534c7ba92f6342ca0a355c13af



-------------------------------------------------

Intel-SIG: commit bc774d46b414 platform/x86/intel-uncore-freq: Increase minor number support.
Backport intel uncore-freq driver update for 5.10 from 6.10

No new changes will be added for minor version 2. Change the minor
version number to 2 and stop displaying log message for unsupported
minor version 2.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/20240415220625.2828339-1-srinivas.pandruvada@linux.intel.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 707d4049

drivers/platform/x86/intel-uncore-frequency-tpmi.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "intel-uncore-frequency-common.h"



#define	UNCORE_MAJOR_VERSION		0

#define	UNCORE_MINOR_VERSION		1

#define	UNCORE_MINOR_VERSION		2

#define UNCORE_HEADER_INDEX		0

#define UNCORE_FABRIC_CLUSTER_OFFSET	8
@@ -329,7 +329,7 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_ 
			goto remove_clusters;

		}



		if (TPMI_MINOR_VERSION(pd_info->ufs_header_ver) != UNCORE_MINOR_VERSION)

		if (TPMI_MINOR_VERSION(pd_info->ufs_header_ver) > UNCORE_MINOR_VERSION)

			dev_info(&auxdev->dev, "Uncore: Ignore: Unsupported minor version:%lx\n",

				 TPMI_MINOR_VERSION(pd_info->ufs_header_ver));