Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fc12b90 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Greg Kroah-Hartman
Browse files

spi: Fix acpi deferred irq probe 



commit d24cfee7f63d6b44d45a67c5662bd1cc48e8b3ca upstream.

When probing spi device take care of deferred probe of ACPI irq gpio
similar like for OF/DT case.

>From practical standpoint this fixes issue with vsc-tp driver on
Dell XP 9340 laptop, which try to request interrupt with spi->irq
equal to -EPROBE_DEFER and fail to probe with the following error:

vsc-tp spi-INTC10D0:00: probe with driver vsc-tp failed with error -22

Suggested-by: default avatarHans de Goede <hdegoede@redhat.com>
Fixes: 33ada67d ("ACPI / spi: attach GPIO IRQ from ACPI description to SPI device")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: Alexis Lothoré <alexis.lothore@bootlin.com> # Dell XPS9320, ov01a10
Link: https://patch.msgid.link/20241122094224.226773-1-stanislaw.gruszka@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3c20b594

drivers/spi/spi.c

+10 −3
Original line number Diff line number Diff line
@@ -358,6 +358,16 @@ static int spi_drv_probe(struct device *dev) 
			spi->irq = 0;

	}



	if (has_acpi_companion(dev) && spi->irq < 0) {

		struct acpi_device *adev = to_acpi_device_node(dev->fwnode);



		spi->irq = acpi_dev_gpio_irq_get(adev, 0);

		if (spi->irq == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		if (spi->irq < 0)

			spi->irq = 0;

	}



	ret = dev_pm_domain_attach(dev, true);

	if (ret)

		return ret;
@@ -1843,9 +1853,6 @@ static acpi_status acpi_register_spi_device(struct spi_controller *ctlr, 
	acpi_set_modalias(adev, acpi_device_hid(adev), spi->modalias,

			  sizeof(spi->modalias));



	if (spi->irq < 0)

		spi->irq = acpi_dev_gpio_irq_get(adev, 0);



	acpi_device_set_enumerated(adev);



	adev->power.flags.ignore_parent = true;