Re: [PATCH v1 1/5] mfd: intel_quark_i2c_gpio: revert "Constify static struct resources"

From: Rikard Falkeborn
Date: Tue Mar 02 2021 - 18:38:38 EST


On Tue, Mar 02, 2021 at 03:56:16PM +0200, Andy Shevchenko wrote:
> The structures are used as place holders, so they are modified at run-time.
> Obviously they may not be constants.
>
> BUG: unable to handle page fault for address: d0643220
> ...
> CPU: 0 PID: 110 Comm: modprobe Not tainted 5.11.0+ #1
> Hardware name: Intel Corp. QUARK/GalileoGen2, BIOS 0x01000200 01/01/2014
> EIP: intel_quark_mfd_probe+0x93/0x1c0 [intel_quark_i2c_gpio]
>
> This partially reverts the commit c4a164f41554d2899bed94bdcc499263f41787b4.
>
> While at it, add a comment to avoid similar changes in the future.
>
> Fixes: c4a164f41554 ("mfd: Constify static struct resources")
> Cc: Rikard Falkeborn <rikard.falkeborn@xxxxxxxxx>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
> drivers/mfd/intel_quark_i2c_gpio.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c
> index 55a9e017edee..124c0ee84169 100644
> --- a/drivers/mfd/intel_quark_i2c_gpio.c
> +++ b/drivers/mfd/intel_quark_i2c_gpio.c
> @@ -72,7 +72,8 @@ static const struct dmi_system_id dmi_platform_info[] = {
> {}
> };
>
> -static const struct resource intel_quark_i2c_res[] = {
> +/* This is used as a place holder and will be modified at run-time */
> +static struct resource intel_quark_i2c_res[] = {
> [INTEL_QUARK_IORES_MEM] = {
> .flags = IORESOURCE_MEM,
> },
> @@ -85,7 +86,8 @@ static struct mfd_cell_acpi_match intel_quark_acpi_match_i2c = {
> .adr = MFD_ACPI_MATCH_I2C,
> };
>
> -static const struct resource intel_quark_gpio_res[] = {
> +/* This is used as a place holder and will be modified at run-time */
> +static struct resource intel_quark_gpio_res[] = {
> [INTEL_QUARK_IORES_MEM] = {
> .flags = IORESOURCE_MEM,
> },
> --
> 2.30.1
>

Sorry about that :(

Reviewed-by: Rikard Falkeborn <rikard.falkeborn@xxxxxxxxx>