platform/x86: intel_speed_select_if: Remove hardcoded map size
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Tue, 3 Oct 2023 16:32:33 +0000 (09:32 -0700)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Wed, 4 Oct 2023 08:10:29 +0000 (11:10 +0300)
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.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231003163234.1856669-4-srinivas.pandruvada@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c

index ff49025ec0856ab587709a352442159bc97144c7..13e068c77d50968df8f9559d91988f453f3a6602 100644 (file)
 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);