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

platform/x86/intel-uncore-freq: Don't present root domain on error 

mainline inclusion
from mainline-v6.10
commit db643cb7ebe524d17b4b13583dda03485d4a1bc0
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=db643cb7ebe524d17b4b13583dda03485d4a1bc0



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

Intel-SIG: commit db643cb7ebe5 platform/x86/intel-uncore-freq: Don't present root domain on error.
Backport intel uncore-freq driver update for 5.10 from 6.10

If none of the clusters are added because of some error, fail to load
driver without presenting root domain. In this case root domain will
present invalid data.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Fixes: 01c10f88 ("platform/x86/intel-uncore-freq: tpmi: Provide cluster level control")
Cc: <stable@vger.kernel.org> # 6.5+
Link: https://lore.kernel.org/r/20240415215210.2824868-1-srinivas.pandruvada@linux.intel.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 2a61f706

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

+7 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_ 
	bool read_blocked = 0, write_blocked = 0;

	struct intel_tpmi_plat_info *plat_info;

	struct tpmi_uncore_struct *tpmi_uncore;

	bool uncore_sysfs_added = false;

	int ret, i, pkg = 0;

	int num_resources;
@@ -384,9 +385,15 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_ 
			}

			/* Point to next cluster offset */

			cluster_offset >>= UNCORE_MAX_CLUSTER_PER_DOMAIN;

			uncore_sysfs_added = true;

		}

	}



	if (!uncore_sysfs_added) {

		ret = -ENODEV;

		goto remove_clusters;

	}



	auxiliary_set_drvdata(auxdev, tpmi_uncore);



	tpmi_uncore->root_cluster.root_domain = true;