From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794590614; b=JPDetCp4h2SaVWJHdKe1IMd7DGYGN1GchZBbjVhgGd11XBGlGOHXkMpUFG9hl1N8xlz9 t2gu9OvoEVm24aYj/26JlGhLnVOj5ghxqtg6TRRhzrOizE6cjo9vj7UkW+FJ71zGibr5v Nh2XsIcEAN39KrurJKY5HOVrM3MJnNMGDoNzEutnMC/jDH1KOYZK97Jgl4MDc1fThRJfN r+cZPa/xI0uZQ3teXdTFg2ROXq/MEW3RrVnDTnyjXrotV8LpwFix2iKqffCruTzB+ZWCs N4K/s3EpkA3zmGeO9bkUtwvXDwnxaMwtyBKFL/kOnR1nc0pNw3Bk4ItPjeayYSDbW7g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590614; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=ObJ9CRloDJM+9Qh3zzc9Wk2bENpvykjUgPF4mDKH6Fg=; b=wFZB0MKbulhdopTtIJiBSDk00wZuOl+9X5iCzJCI/YA1qxVE9ZcWYyDDDfU2uXB/74XS OEVV3u68G+0/iddarrO0CiUwnfsZ2j6YI7A4Bx+jv+5OFQnQ0FZrgdu0+KTb3gnJSe21l MS6BYUtLMBN7zZfcoBPzj6XkCjJPX/m7If9zaBXHLOwoRJTtLan6I2WstwttVQ+dCNplN EyYbaJdeq+ZdO+SOVjY0t+FjfikfBKMTmGIyV/ZNO2h1rC+2vTle9bxMYrXm3JJFC5IRp d9v/sJ4o3pGMoe7JCg5e2FUMVwmTjP9hBqaeTsH0p8T1eaozRgd1grXyCGwQyWgeU3w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0elOjCSe; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EFC3606C0B5; Fri, 13 Nov 2026 17:23:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0elOjCSe Received: by smtp.kernel.org (Postfix) with ESMTPSA id 741B21F000C5; Fri, 13 Nov 2026 17:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590613; bh=ObJ9CRloDJM+9Qh3zzc9Wk2bENpvykjUgPF4mDKH6Fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0elOjCSexMXkDc506Ti4SVxFidbC1w1sNpO+B7p0A1fttw+14RqIqSDPIgNdaJRKO Q3L+NOmi1zzRbp6Rq0POxT2u7ZflB65UnGjLzrKcHsFxPqxpDtEQ4PH+TTjS1cqX+5 WFfKE1juIM9q6lrskYTb6GdBi/WzWd7NOIOL0ufg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , Mark Brown , Sasha Levin Subject: [PATCH 6.18 539/686] spi: cadence-xspi: Replace ACPI specifics by agnostic APIs Date: Fri, 13 Nov 2026 10:51:12 -0500 Message-ID: <20261113153839.531826057@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Shevchenko [ Upstream commit 6f9e4740e8591176eb90bb1dae95bbbb5c7d789e ] Replace ACPI specific calls to get device property with the agnostic one. The code looses the direct dependency to the ACPI APIs and get cleaner. This doesn't change functionality. While at it, drop now unneeded acpi.h. Signed-off-by: Andy Shevchenko Link: https://patch.msgid.link/20251129151739.3998668-1-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown Stable-dep-of: ea9854a169e9 ("spi: cadence-xspi: reject SDMA transfers larger than the requested length") Signed-off-by: Sasha Levin --- drivers/spi/spi-cadence-xspi.c | 36 +++++++++++----------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c index c3676b21e8167..b6b42daae1bce 100644 --- a/drivers/spi/spi-cadence-xspi.c +++ b/drivers/spi/spi-cadence-xspi.c @@ -2,7 +2,6 @@ // Cadence XSPI flash controller driver // Copyright (C) 2020-21 Cadence -#include #include #include #include @@ -21,6 +20,7 @@ #include #include #include +#include #define CDNS_XSPI_MAGIC_NUM_VALUE 0x6522 #define CDNS_XSPI_MAX_BANKS 8 @@ -775,19 +775,15 @@ static int marvell_xspi_mem_op_execute(struct spi_mem *mem, return ret; } -#ifdef CONFIG_ACPI static bool cdns_xspi_supports_op(struct spi_mem *mem, const struct spi_mem_op *op) { struct spi_device *spi = mem->spi; - const union acpi_object *obj; - struct acpi_device *adev; + struct device *dev = &spi->dev; + u32 value; - adev = ACPI_COMPANION(&spi->dev); - - if (!acpi_dev_get_property(adev, "spi-tx-bus-width", ACPI_TYPE_INTEGER, - &obj)) { - switch (obj->integer.value) { + if (!device_property_read_u32(dev, "spi-tx-bus-width", &value)) { + switch (value) { case 1: break; case 2: @@ -800,16 +796,13 @@ static bool cdns_xspi_supports_op(struct spi_mem *mem, spi->mode |= SPI_TX_OCTAL; break; default: - dev_warn(&spi->dev, - "spi-tx-bus-width %lld not supported\n", - obj->integer.value); + dev_warn(dev, "spi-tx-bus-width %u not supported\n", value); break; } } - if (!acpi_dev_get_property(adev, "spi-rx-bus-width", ACPI_TYPE_INTEGER, - &obj)) { - switch (obj->integer.value) { + if (!device_property_read_u32(dev, "spi-rx-bus-width", &value)) { + switch (value) { case 1: break; case 2: @@ -822,9 +815,7 @@ static bool cdns_xspi_supports_op(struct spi_mem *mem, spi->mode |= SPI_RX_OCTAL; break; default: - dev_warn(&spi->dev, - "spi-rx-bus-width %lld not supported\n", - obj->integer.value); + dev_warn(dev, "spi-rx-bus-width %u not supported\n", value); break; } } @@ -834,7 +825,6 @@ static bool cdns_xspi_supports_op(struct spi_mem *mem, return true; } -#endif static int cdns_xspi_adjust_mem_op_size(struct spi_mem *mem, struct spi_mem_op *op) { @@ -847,17 +837,13 @@ static int cdns_xspi_adjust_mem_op_size(struct spi_mem *mem, struct spi_mem_op * } static const struct spi_controller_mem_ops cadence_xspi_mem_ops = { -#ifdef CONFIG_ACPI - .supports_op = cdns_xspi_supports_op, -#endif + .supports_op = PTR_IF(IS_ENABLED(CONFIG_ACPI), cdns_xspi_supports_op), .exec_op = cdns_xspi_mem_op_execute, .adjust_op_size = cdns_xspi_adjust_mem_op_size, }; static const struct spi_controller_mem_ops marvell_xspi_mem_ops = { -#ifdef CONFIG_ACPI - .supports_op = cdns_xspi_supports_op, -#endif + .supports_op = PTR_IF(IS_ENABLED(CONFIG_ACPI), cdns_xspi_supports_op), .exec_op = marvell_xspi_mem_op_execute, .adjust_op_size = cdns_xspi_adjust_mem_op_size, }; -- 2.53.0