spi: intel: Keep the BIOS partition inside the first chip

If there are two flash chips connected flash regions can refer to the
second chip too. In this case we may see the following warning:

  mtd: partition "BIOS" extends beyond the end of device "0000:00:1f.5" --
  	size truncated to 0x400000

For this reason, check the BIOS partition size against the chip size and
make sure it stays within the that.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20240201121638.207632-2-mika.westerberg@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-intel.c b/drivers/spi/spi-intel.c
index 467d39bf00b44f2f1e58d7746825995a7b03573b..3e5dcf2b3c8a19621bbfea6bd724440ddcc7f0c1 100644 (file)
--- a/drivers/spi/spi-intel.c
+++ b/drivers/spi/spi-intel.c
@@ -1254,6 +1254,13 @@ static void intel_spi_fill_partition(struct intel_spi *ispi,
                if (end > part->size)
                        part->size = end;
        }
+
+       /*
+        * Regions can refer to the second chip too so in this case we
+        * just make the BIOS partition to occupy the whole chip.
+        */
+       if (ispi->chip0_size && part->size > ispi->chip0_size)
+               part->size = MTDPART_SIZ_FULL;
 }
 
 static int intel_spi_read_desc(struct intel_spi *ispi)
@@ -1350,6 +1357,10 @@ static int intel_spi_populate_chip(struct intel_spi *ispi)
        struct spi_board_info chip;
        int ret;
 
+       ret = intel_spi_read_desc(ispi);
+       if (ret)
+               return ret;
+
        pdata = devm_kzalloc(ispi->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
                return -ENOMEM;
@@ -1369,10 +1380,6 @@ static int intel_spi_populate_chip(struct intel_spi *ispi)
        if (!spi_new_device(ispi->host, &chip))
                return -ENODEV;
 
-       ret = intel_spi_read_desc(ispi);
-       if (ret)
-               return ret;
-
        /* Add the second chip if present */
        if (ispi->host->num_chipselect < 2)
                return 0;