From nobody Mon Feb 9 11:46:52 2026 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30C43342519 for ; Fri, 19 Dec 2025 21:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766180015; cv=none; b=OTOqtV5InrY8x8qgM7eM/jjBbs+cgarXqWzg8f353fTg/iyo6tZfaUD6TCplHNrQCYQjMSP0FOHyiHPGjedrXZSbSuFMjjqCjDQYHHNcf/tYDl4vjk3m0IbmAHlc7Wko70nmQ13r4Z4It/TXfxQTgbXDi88r7qLToJjBK/F7lYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766180015; c=relaxed/simple; bh=dmKDx1Fv/D9g60Hrpe80FFHumuzs/k3EreCFMwZe2ow=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=npGAAfmk8Y3zXwPNepvVBwyRB12hWpymq47IU8VFZ9DRuNpgOoYKxNyuiuZRlg8iAj+LTz2VUgDAbFM3xCaO2twoF4ri0u90GdpFfW3nLDo3f/N4bgIxW7my9fIf4ux1kasoeNT1zt+6nY9GgSDASF0dF2JugwRBhbbtxEIL7HI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=Q8fmSvkM; arc=none smtp.client-ip=209.85.210.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="Q8fmSvkM" Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-7c77fc7c11bso2308259a34.1 for ; Fri, 19 Dec 2025 13:33:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1766180011; x=1766784811; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ovFocDuZESoFfLXGTE37+Y+HD9mVmqzpjLno5vNVGiU=; b=Q8fmSvkMRFxx5bWlYmkVUrNu4W7uwJ7aVDTySM9z74Q0BiNno/TJqLpaXzqVvYxLVd +gVTyNjDJzEt81uwjXchuXpdZes7ty7oJoAmSOooQfaPuh+9CvgNfkZo3UTfZhrd6yqC M6wUCc5wct7EcHE3OG0aFJKG08QEKDNHR5F4Ab19yJduFRtDzpC/BsEOJqUeVJptObSf d+yDdgLa6dtAyoWpayuMyW5EXThbjK0lcIlC3H3Cnf4wfKh+gousY1EXK9lX+xQzA0+6 T2PCTzoGX1llP4iWDYFFZXyDtOjTTypFhh+2EOx2vlAlH7qBtMMa52yoL/j2Z39k3vYe WtPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766180011; x=1766784811; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ovFocDuZESoFfLXGTE37+Y+HD9mVmqzpjLno5vNVGiU=; b=Jxd96xFr0B04WxI087lqVJRrG/JZ+y3z+VYhJRvNAKcCtjSf/4iR1UNMCwCOL30wlj 5Sg7N4MtqFdKecsJj7sRWt+UrDXT2k/tqf61qXi07lKFl+Emv4MfVi/LnIteO6IWgCbx vwZ41E8thStCFpbopZTiSri3otRrYyz3ECj+0zXIqSbPoOjwnQH/v8sGgAcrXqoyk4Ap H9nukow/qNhKOJ/O7hpVFzrNGBVehBV/vTJhDoxcGu+aEPhDiSXbJxyhLHLukPKxMS9d WRoTlnmMbMY2fXQDCS7dImDWpZDXxC55O1P8/QEWfTQhV4nC1I+7z+72vTmm1JYFBgYO 6hUA== X-Forwarded-Encrypted: i=1; AJvYcCUQLTSIkCxvzLAwqcHkZMwSMd82EaZ8mFsJjIqmacdQoUwdRr+CQi7XnHRgfKuWGxMXOoNxk779tC+GdHY=@vger.kernel.org X-Gm-Message-State: AOJu0YyK47l4Mj5wlubf87MXnUSaj/XV3vRhoEisfJz2Mr8jEsUaZxSm 0dGKUvpWZB2LzjUlfNbo+5emIWvjhzNDK/zm+PYOwLdjiza3rRtPS4xQEnn0tA8Ml3c= X-Gm-Gg: AY/fxX75s396V5dfyJDUEo46I0hNXPsK7fJ5zdSgYtIEEPf/ETOA8AI4N//hDWD9neT wGgHl35DW2ecGs9nJ76iQL8G5xi2EJIdgdJBqOrmn8rE7JJMnKDJ+J/r0NU3Vl6Quonmnv1D8tP wXCTJ8xccSEjcLfbNoJV8VcZnAP/SdCogIMsHTT/xV02m0FSOZQqfTWZVN5bzU7XivYxNbej3qe LPY7PzgZFLOCPEC6zyfuhLBJqXtPwbFpzz5MtO7izkdtG7wsOMq0cp7yv7QJxwk45nEqTU8hMQr i3qI/6CVhXEootDxcSs6ZlTBVXs1/huV8MrQBx3EQMBXmZNNGsMbBGiARaWUyZOwmeTDKRBMpIq XC9PIfLsOWYrObD9ybbMG4pjE5gW+6Q1bTd9cOwnjnubBMTNpDqxfNAnWy80C7lP6nxzcX64nJB L9MNYcs6BKaAaqIQ== X-Google-Smtp-Source: AGHT+IE4mrII5d5kc6to1lNBrT3gGh5165SAEtgCvCvMjJA/KpQ8Ag5b2i5DItbp06iIzxckkFNigg== X-Received: by 2002:a05:6830:314c:b0:7c7:6a56:cfb5 with SMTP id 46e09a7af769-7cc65e3a826mr2355580a34.11.1766180010938; Fri, 19 Dec 2025 13:33:30 -0800 (PST) Received: from [127.0.1.1] ([2600:8803:e7e4:500:9b20:bac4:9680:435]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7cc667563ffsm2485045a34.13.2025.12.19.13.33.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 13:33:30 -0800 (PST) From: David Lechner Date: Fri, 19 Dec 2025 15:32:11 -0600 Subject: [PATCH v4 3/9] spi: support controllers with multiple data lanes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251219-spi-add-multi-bus-support-v4-3-145dc5204cd8@baylibre.com> References: <20251219-spi-add-multi-bus-support-v4-0-145dc5204cd8@baylibre.com> In-Reply-To: <20251219-spi-add-multi-bus-support-v4-0-145dc5204cd8@baylibre.com> To: Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Marcelo Schmitt , Michael Hennerich , =?utf-8?q?Nuno_S=C3=A1?= , Jonathan Cameron , Andy Shevchenko Cc: Sean Anderson , linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, David Lechner X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8962; i=dlechner@baylibre.com; h=from:subject:message-id; bh=dmKDx1Fv/D9g60Hrpe80FFHumuzs/k3EreCFMwZe2ow=; b=owEBbQGS/pANAwAKAcLMIAH/AY/AAcsmYgBpRcR495+H4JkgnbUmwE4Y5sb4jQHQpBE3pTlSD 1CYxR4c2riJATMEAAEKAB0WIQTsGNmeYg6D1pzYaJjCzCAB/wGPwAUCaUXEeAAKCRDCzCAB/wGP wBbgB/9iwCruGaJtA9pANY7KaVwhRBTGFCuuG6Q5kJXLFVp7vxsztqYZCxSY+uojU5VntK08fPh jUbKXDq/xkOU/zFmxmRM2a3lJU5q646qWmVabVL7P4r2SMwi9Ja29S47gyA/VaoBjPyyh+YN7Za XV4RXzMNYl/ac3So5Rfci7CH+02DO99+U4+oC9wxe/EY3F0frIT5RHOsgZmb78laHQXaHd+1XiW 9I76hLvMNHEfjaL6N7zLeOCxRmW9Fc5wAK7ZNU0CCyAont47zgRr9xUoR9MuX7SrXuylt3jPtcl YSR4XbxemwIHFIQjwdQs6lTgZS2WzqgSkyPEFJlmrw11RTn3 X-Developer-Key: i=dlechner@baylibre.com; a=openpgp; fpr=8A73D82A6A1F509907F373881F8AF88C82F77C03 Add support for SPI controllers with multiple physical SPI data lanes. (A data lane in this context means lines connected to a serializer, so a controller with two data lanes would have two serializers in a single controller). This is common in the type of controller that can be used with parallel flash memories, but can be used for general purpose SPI as well. To indicate support, a controller just needs to set ctlr->num_data_lanes to something greater than 1. Peripherals indicate which lane they are connected to via device tree (ACPI support can be added if needed). The spi-{tx,rx}-bus-width DT properties can now be arrays. The length of the array indicates the number of data lanes, and each element indicates the bus width of that lane. For now, we restrict all lanes to have the same bus width to keep things simple. Support for an optional controller lane mapping property is also implemented. Signed-off-by: David Lechner --- v4 changes: - Update for changes in devicetree bindings. - Don't put new fields in the middle of CS fields. - Dropped acks since this was a significant rework. v3 changes: * Renamed "buses" to "lanes" to reflect devicetree property name change. This patch has been seen in a different series [1] by Sean before: [1]: https://lore.kernel.org/linux-spi/20250616220054.3968946-4-sean.anders= on@linux.dev/ Changes: * Use u8 array instead of bitfield so that the order of the mapping is preserved. (Now looks very much like chip select mapping.) * Added doc strings for added fields. * Tweaked the comments. --- drivers/spi/spi.c | 114 ++++++++++++++++++++++++++++++++++++++++++++= +++- include/linux/spi/spi.h | 22 ++++++++++ 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index e25df9990f82..9caa22583b8f 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2370,7 +2370,52 @@ static int of_spi_parse_dt(struct spi_controller *ct= lr, struct spi_device *spi, spi->mode |=3D SPI_CS_HIGH; =20 /* Device DUAL/QUAD mode */ - if (!of_property_read_u32(nc, "spi-tx-bus-width", &value)) { + + rc =3D of_property_read_u32_array(nc, "spi-tx-lane-map", spi->tx_lane_map, + ARRAY_SIZE(spi->tx_lane_map)); + if (rc =3D=3D -EINVAL) { + /* Default lane map */ + for (idx =3D 0; idx < ARRAY_SIZE(spi->tx_lane_map); idx++) + spi->tx_lane_map[idx] =3D idx; + } else if (rc < 0) { + dev_err(&ctlr->dev, + "failed to read spi-tx-lane-map property: %d\n", rc); + return rc; + } + + rc =3D of_property_count_u32_elems(nc, "spi-tx-bus-width"); + if (rc < 0 && rc !=3D -EINVAL) { + dev_err(&ctlr->dev, + "failed to read spi-tx-bus-width property: %d\n", rc); + return rc; + } + + if (rc =3D=3D -EINVAL) { + /* Default when property is not present. */ + spi->num_tx_lanes =3D 1; + } else { + u32 first_value; + + spi->num_tx_lanes =3D rc; + + for (idx =3D 0; idx < spi->num_tx_lanes; idx++) { + of_property_read_u32_index(nc, "spi-tx-bus-width", idx, + &value); + + /* + * For now, we only support all lanes having the same + * width so we can keep using the existing mode flags. + */ + if (!idx) + first_value =3D value; + else if (first_value !=3D value) { + dev_err(&ctlr->dev, + "spi-tx-bus-width has inconsistent values: first %d vs later %d\n", + first_value, value); + return -EINVAL; + } + } + switch (value) { case 0: spi->mode |=3D SPI_NO_TX; @@ -2394,7 +2439,61 @@ static int of_spi_parse_dt(struct spi_controller *ct= lr, struct spi_device *spi, } } =20 - if (!of_property_read_u32(nc, "spi-rx-bus-width", &value)) { + for (idx =3D 0; idx < spi->num_tx_lanes; idx++) { + if (spi->tx_lane_map[idx] >=3D spi->controller->num_data_lanes) { + dev_err(&ctlr->dev, + "spi-tx-lane-map has invalid value %d (num_data_lanes=3D%d)\n", + spi->tx_lane_map[idx], + spi->controller->num_data_lanes); + return -EINVAL; + } + } + + rc =3D of_property_read_u32_array(nc, "spi-rx-lane-map", spi->rx_lane_map, + ARRAY_SIZE(spi->rx_lane_map)); + if (rc =3D=3D -EINVAL) { + /* Default lane map */ + for (idx =3D 0; idx < ARRAY_SIZE(spi->rx_lane_map); idx++) + spi->rx_lane_map[idx] =3D idx; + } else if (rc < 0) { + dev_err(&ctlr->dev, + "failed to read spi-rx-lane-map property: %d\n", rc); + return rc; + } + + rc =3D of_property_count_u32_elems(nc, "spi-rx-bus-width"); + if (rc < 0 && rc !=3D -EINVAL) { + dev_err(&ctlr->dev, + "failed to read spi-rx-bus-width property: %d\n", rc); + return rc; + } + + if (rc =3D=3D -EINVAL) { + /* Default when property is not present. */ + spi->num_rx_lanes =3D 1; + } else { + u32 first_value; + + spi->num_rx_lanes =3D rc; + + for (idx =3D 0; idx < spi->num_rx_lanes; idx++) { + of_property_read_u32_index(nc, "spi-rx-bus-width", idx, + &value); + + /* + * For now, we only support all lanes having the same + * width so we can keep using the existing mode flags. + */ + if (!idx) + first_value =3D value; + else if (first_value !=3D value) { + dev_err(&ctlr->dev, + "spi-rx-bus-width has inconsistent values: first %d vs later %d\n", + first_value, value); + return -EINVAL; + } + } + switch (value) { case 0: spi->mode |=3D SPI_NO_RX; @@ -2418,6 +2517,16 @@ static int of_spi_parse_dt(struct spi_controller *ct= lr, struct spi_device *spi, } } =20 + for (idx =3D 0; idx < spi->num_rx_lanes; idx++) { + if (spi->rx_lane_map[idx] >=3D spi->controller->num_data_lanes) { + dev_err(&ctlr->dev, + "spi-rx-lane-map has invalid value %d (num_data_lanes=3D%d)\n", + spi->rx_lane_map[idx], + spi->controller->num_data_lanes); + return -EINVAL; + } + } + if (spi_controller_is_target(ctlr)) { if (!of_node_name_eq(nc, "slave")) { dev_err(&ctlr->dev, "%pOF is not called 'slave'\n", @@ -3066,6 +3175,7 @@ struct spi_controller *__spi_alloc_controller(struct = device *dev, mutex_init(&ctlr->add_lock); ctlr->bus_num =3D -1; ctlr->num_chipselect =3D 1; + ctlr->num_data_lanes =3D 1; ctlr->target =3D target; if (IS_ENABLED(CONFIG_SPI_SLAVE) && target) ctlr->dev.class =3D &spi_target_class; diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index cb2c2df31089..7aff60ab257e 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -23,6 +23,9 @@ /* Max no. of CS supported per spi device */ #define SPI_DEVICE_CS_CNT_MAX 4 =20 +/* Max no. of data lanes supported per spi device */ +#define SPI_DEVICE_DATA_LANE_CNT_MAX 8 + struct dma_chan; struct software_node; struct ptp_system_timestamp; @@ -174,6 +177,10 @@ extern void spi_transfer_cs_change_delay_exec(struct s= pi_message *msg, * @cs_index_mask: Bit mask of the active chipselect(s) in the chipselect = array * @cs_gpiod: Array of GPIO descriptors of the corresponding chipselect li= nes * (optional, NULL when not using a GPIO line) + * @tx_lane_map: Map of peripheral lanes (index) to controller lanes (valu= e). + * @num_tx_lanes: Number of transmit lanes wired up. + * @rx_lane_map: Map of peripheral lanes (index) to controller lanes (valu= e). + * @num_rx_lanes: Number of receive lanes wired up. * * A @spi_device is used to interchange data between an SPI target device * (usually a discrete chip) and CPU memory. @@ -242,6 +249,12 @@ struct spi_device { =20 struct gpio_desc *cs_gpiod[SPI_DEVICE_CS_CNT_MAX]; /* Chip select gpio de= sc */ =20 + /* Multi-lane SPI controller support. */ + u32 tx_lane_map[SPI_DEVICE_DATA_LANE_CNT_MAX]; + u32 num_tx_lanes; + u32 rx_lane_map[SPI_DEVICE_DATA_LANE_CNT_MAX]; + u32 num_rx_lanes; + /* * Likely need more hooks for more protocol options affecting how * the controller talks to each chip, like: @@ -401,6 +414,7 @@ extern struct spi_device *spi_new_ancillary_device(stru= ct spi_device *spi, u8 ch * SPI targets, and are numbered from zero to num_chipselects. * each target has a chipselect signal, but it's common that not * every chipselect is connected to a target. + * @num_data_lanes: Number of data lanes supported by this controller. Def= ault is 1. * @dma_alignment: SPI controller constraint on DMA buffers alignment. * @mode_bits: flags understood by this controller driver * @buswidth_override_bits: flags to override for this controller driver @@ -576,6 +590,14 @@ struct spi_controller { */ u16 num_chipselect; =20 + /* + * Some specialized SPI controllers can have more than one physical + * data lane interface per controller (each having it's own serializer). + * This specifies the number of data lanes in that case. Other + * controllers do not need to set this (defaults to 1). + */ + u16 num_data_lanes; + /* Some SPI controllers pose alignment requirements on DMAable * buffers; let protocol drivers know about these requirements. */ --=20 2.43.0