Commit b4845ce3 authored by Steve Wahl's avatar Steve Wahl Committed by Yingbao Jia
Browse files

platform/x86: ISST: Remove 8 socket limit 

mainline inclusion
from mainline-v6.4-rc4
commit bbb320bf
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I8WOEO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bbb320bfe2c3e9740fe89cfa0a7089b4e8bfc4ff



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

Stop restricting the PCI search to a range of PCI domains fed to
pci_get_domain_bus_and_slot().  Instead, use for_each_pci_dev() and
look at all PCI domains in one pass.

On systems with more than 8 sockets, this avoids error messages like
"Information: Invalid level, Can't get TDP control information at
specified levels on cpu 480" from the intel speed select utility.

Intel-SIG: commit bbb320bf platform/x86: ISST: Remove 8 socket limit.
Backport Intel speed select ISST driver support on TPMI.

Fixes: aa2ddd24 ("platform/x86: ISST: Use numa node id for cpu pci dev mapping")
Signed-off-by: default avatarSteve Wahl <steve.wahl@hpe.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20230519160420.2588475-1-steve.wahl@hpe.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 7c79f736

drivers/platform/x86/intel_speed_select_if/isst_if_common.c

+5 −7
Original line number Diff line number Diff line
@@ -304,14 +304,13 @@ struct isst_if_pkg_info { 
static struct isst_if_cpu_info *isst_cpu_info;

static struct isst_if_pkg_info *isst_pkg_info;



#define ISST_MAX_PCI_DOMAINS	8



static struct pci_dev *_isst_if_get_pci_dev(int cpu, int bus_no, int dev, int fn)

{

	struct pci_dev *matched_pci_dev = NULL;

	struct pci_dev *pci_dev = NULL;

	struct pci_dev *_pci_dev = NULL;

	int no_matches = 0, pkg_id;

	int i, bus_number;

	int bus_number;



	if (bus_no < 0 || bus_no >= ISST_MAX_BUS_NUMBER || cpu < 0 ||

	    cpu >= nr_cpu_ids || cpu >= num_possible_cpus())
@@ -323,12 +322,11 @@ static struct pci_dev *_isst_if_get_pci_dev(int cpu, int bus_no, int dev, int fn 
	if (bus_number < 0)

		return NULL;



	for (i = 0; i < ISST_MAX_PCI_DOMAINS; ++i) {

		struct pci_dev *_pci_dev;

	for_each_pci_dev(_pci_dev) {

		int node;



		_pci_dev = pci_get_domain_bus_and_slot(i, bus_number, PCI_DEVFN(dev, fn));

		if (!_pci_dev)

		if (_pci_dev->bus->number != bus_number ||

		    _pci_dev->devfn != PCI_DEVFN(dev, fn))

			continue;



		++no_matches;