From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1EFE1E3DF9; Tue, 3 Dec 2024 16:13:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733242410; cv=none; b=IRliOevm8G+1PDzhN/KHTRv5lwbZs+ZQeEQcnk37cxNCs9qN/NNb+B1m2w1eLfQR+wozq/nOST5qHE0j7pnnBfZUzDzGAc9OTpEPoufDfTaaHDY67jbZDinD5TwME5vnSw1ZUxorZwSEuv0WDxEy6+S5HjcAthtLFnh2msUz3Js= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733242410; c=relaxed/simple; bh=bifpxR3I18NwO/hC3E06PMrngFlAFFhnFSyNnD4aEYc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tixmiUK/oabx9BNM9b+GD6AxhxnRrXJGY33w9/8nxucAG7lhQyslbaj9E3hHBgYwkFFKW8Na/AWp871OJiwYv+ubPUKcOUP2RD5hQp12t8WNx9JSPLp/JHIQsssTtDcw6FAxCMzUvn0tsIz+kbw9v74bZj5roHgmmzzhXT7VDn4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YkbxpQGe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YkbxpQGe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43B1AC4CECF; Tue, 3 Dec 2024 16:13:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733242410; bh=bifpxR3I18NwO/hC3E06PMrngFlAFFhnFSyNnD4aEYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YkbxpQGe5Ej/bGX4vrt/lR4dBDT34X8HZG5itZ++ngE1X9V78M/GGog4TOJb6Q4+i 5r1BZYxc9rE8STbSJUZRg3jiLE9hliOL4+W6e5xq4AoaqYP71yhkr5ArSy7HSzJ66Q OcUbBS7wLJu2WrpPoHM36pePwYG8zhT9pRczfw6A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans de Goede , Stanislaw Gruszka , Mark Brown , =?UTF-8?q?Alexis=20Lothor=C3=A9?= Subject: [PATCH 6.12 696/826] spi: Fix acpi deferred irq probe Date: Tue, 3 Dec 2024 15:47:03 +0100 Message-ID: <20241203144810.906562304@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203144743.428732212@linuxfoundation.org> References: <20241203144743.428732212@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stanislaw Gruszka 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: Hans de Goede Fixes: 33ada67da352 ("ACPI / spi: attach GPIO IRQ from ACPI description to SPI device") Cc: stable@vger.kernel.org Signed-off-by: Stanislaw Gruszka Reviewed-by: Hans de Goede Tested-by: Alexis Lothoré # Dell XPS9320, ov01a10 Link: https://patch.msgid.link/20241122094224.226773-1-stanislaw.gruszka@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -424,6 +424,16 @@ static int spi_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; @@ -2869,9 +2879,6 @@ static acpi_status acpi_register_spi_dev 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;