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

platform/x86: intel_speed_select_if: Remove hardcoded map size 

mainline inclusion
from mainline-v6.7-rc1
commit 7525cea3ef9384054a30f25ebb501234befecdcb
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=7525cea3ef9384054a30f25ebb501234befecdcb



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

The driver is using 256 as the size while calling devm_ioremap(). The
maximum offset can be obtained from isst_mmio_range. Add a field "size"
to the isst_mmio_range and use it instead of hardcoding.

No functional impact is expected.

Intel-SIG: commit 7525cea3ef93 platform/x86: intel_speed_select_if: Remove hardcoded map size.
Backport Intel speed select ISST driver support on TPMI.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231003163234.1856669-4-srinivas.pandruvada@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 be634345

drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c

+10 −6
Original line number Diff line number Diff line
@@ -18,16 +18,17 @@ 
struct isst_mmio_range {

	int beg;

	int end;

	int size;

};



static struct isst_mmio_range mmio_range_devid_0[] = {

	{0x04, 0x14},

	{0x20, 0xD0},

	{0x04, 0x14, 0x18},

	{0x20, 0xD0, 0xD4},

};



static struct isst_mmio_range mmio_range_devid_1[] = {

	{0x04, 0x14},

	{0x20, 0x11C},

	{0x04, 0x14, 0x18},

	{0x20, 0x11C, 0x120},

};



struct isst_if_device {
@@ -114,13 +115,16 @@ static int isst_if_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pcu_base &= GENMASK(10, 0);

	base_addr = (u64)mmio_base << 23 | (u64) pcu_base << 12;

	punit_dev->punit_mmio = devm_ioremap(&pdev->dev, base_addr, 256);



	punit_dev->mmio_range = (struct isst_mmio_range *) ent->driver_data;



	punit_dev->punit_mmio = devm_ioremap(&pdev->dev, base_addr,

					     punit_dev->mmio_range[1].size);

	if (!punit_dev->punit_mmio)

		return -ENOMEM;



	mutex_init(&punit_dev->mutex);

	pci_set_drvdata(pdev, punit_dev);

	punit_dev->mmio_range = (struct isst_mmio_range *) ent->driver_data;



	memset(&cb, 0, sizeof(cb));

	cb.cmd_size = sizeof(struct isst_if_io_reg);