From nobody Mon Jun 15 19:12:36 2026 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 29D793AE1A0 for ; Mon, 13 Apr 2026 10:02:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776074529; cv=none; b=s3WIR/67SmgI6u75jLzHGZfhWxe07ufutL5pKV9oJU9heOi5KGWuj3bmQMO6N6Y38k7WS1HH5GZsOS1BC7b/G6SakijD5wHBr+3FfGB1jcL4T+EITJ7paeLe4XQ+WwHDxOvwjll0QB0+N+cQ+NLcVev0ZJ9qdg+ZD8eFNKshRWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776074529; c=relaxed/simple; bh=qC/bld90r+ThMcnTaEI8CINzwhOGNircQN5AmvhHCP0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D6mmTjf5HA5UrK4WqH3Oal46Ygbg1H2kmoZEFhwvH8QvN4fbYIgh9Pd869AUboIzzumcn1xmZLUU2u1EdzubpZWtjKKoWVA0xqgVkKA+gc/hCglrmnQmmGxDbCYBvSkdbbO00JEUWTnXteCQsQ1ccCd5oqcbFEXNtg1Fqp4rFLc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qoUccUgv; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qoUccUgv" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-b97f9587e6eso559753566b.3 for ; Mon, 13 Apr 2026 03:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776074525; x=1776679325; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QkilzuMUQETyKz1FjFPqWn2VyiH1H/H3jmR+rqzk7H0=; b=qoUccUgvKtNQgbQfRJhbpWS660seLNbDFcSWxSKZ3sV5qXXch5gT+YTlPSZGmk8l21 pE/wT69ivm/oTcAv3+B1G3KMNrCucRDLemO6q34KuEwOlxPm6+FUGXD2K+yMWEak8I+O prM0zPPOIlPB3l8Mc4rdm/T1blKKvUucgJroH7t/U5atUaO7m4L5ZzRyPSJNbUtbwk0u bCb8Za8jq260aU887lrCp92atTyPUYXCsbGW3rIgl46OGEGdCZtKwJJ5LRg8tcqrZpaE xPqFFpuAtICkfnNUFCUgB0xxvZg/VKm1XKdbArNTZKVF/s5KFOkBnVCd84XM+ldztMR0 bFxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776074525; x=1776679325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QkilzuMUQETyKz1FjFPqWn2VyiH1H/H3jmR+rqzk7H0=; b=MBqZcCD2Istu0C2rHNC0lU+MMwlNAxRpk8L2KYIJgBh+fMArHzZhC8LvU7gjDkv5Sa Jd2SXcXLNUIxtF4n1iMB9ueyCUytbaaG3cTX+wRh6nt/GkrlQfjk5htDj7lhnVBEmYVo DUAUx0LqH9ELhG2P4ROxSHmH2wTRVPrkBYYKNUjsqvk59//Kq4YB7NkEmBH49fWVc4wx IEWPho3Di5g/LQU5nJAIcs1M7saznkL2uaMlZOHBAcCzSTgSoPQRRLPzA9EYrANYeJ0l bAFitZjqyZErPFd3J4Oe//NByLODG7+Tr0vi08zn3Ka+nA4bQhUF6+wdZwztnHPDrMez 4r8g== X-Forwarded-Encrypted: i=1; AFNElJ/XEOXXqPoE4GKO5hNLVurOtC1gywmVuHYl7vVa2+PF+pi0zeCg459yCZprHC98R+YZBxVbtUHpo/N1wRc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywt8zMdLJc2YjtvnO3url+dRTFYhwU+ORE1nEWn2YEXZiS+Puf1 3Fy64NddfdYft+nGMn19TnGz4bnWPDU9jTwEupSaED9pC/l8s+vZER/FT2un3l7+ X-Gm-Gg: AeBDieuGstBFHe6B5afXJxHOiNhA1Ebkvj4IxuF0vvE69FuyLTsKYm7KK5xHdg5kmQq O4eagfAS4xPAfgFKfCpxKyAdb61ALT70cgW2753hcyu5UMlsrnNl8THUzddhq/PztGmm5GnvoUm dygzrOK3pRqLFxA59YZG5RAa0wr0Iyx34kig0Z0sDwfY0hgblwfJstvpIrVeY27AM8FtZd0WmvD fms3cRfg5tjnJe3V1wuLlTULorbUKdNVvwvip395tTOK7QIIYTyM7HAg/0PfapYrv+SZKVPMw6e UYTRtp/WOO3U2cORqij6BD5VyASEouanOWiiirWHchg+XdBpIfbP9UlddU9ZuwYmhmmF9LpRrYj PvAOkIfmrPM/Qmwlz2N3fKq5hCCum2JxU3NqeCHo/khK5hWW/o4n5JFrnHgJ1dICwDgzpY0vQup rKfmvHK9N9/c9iQcUQw3VFow== X-Received: by 2002:a17:906:518c:20b0:b9c:7748:a26f with SMTP id a640c23a62f3a-b9d7260e086mr530307666b.17.1776074525085; Mon, 13 Apr 2026 03:02:05 -0700 (PDT) Received: from khalil-hp.home ([62.250.67.33]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9d6e7f189esm291993566b.58.2026.04.13.03.02.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 03:02:04 -0700 (PDT) From: Khalil X-Google-Original-From: Khalil To: broonie@kernel.org, hdegoede@kernel.org, ilpo.jarvinen@linux.intel.com Cc: rf@opensource.cirrus.com, linux-spi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Khalil , Khalil Subject: [PATCH v2 1/3] spi: Preserve preset cs_gpiod in __spi_add_device() Date: Mon, 13 Apr 2026 12:01:38 +0200 Message-ID: <20260413100140.579845-2-khalil@rentman.nl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413100140.579845-1-khalil@rentman.nl> References: <20260413100140.579845-1-khalil@rentman.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" __spi_add_device() unconditionally overwrites spi->cs_gpiod[] from ctlr->cs_gpiods[cs], even if the caller has already set a GPIO descriptor on the device. This prevents drivers like serial-multi-instantiate from pre-configuring a GPIO chip select acquired from ACPI before adding the device. Skip the overwrite when the device already has a cs_gpiod set for the given index, allowing callers to preset GPIO chip selects that aren't described in the controller's cs-gpios property. This is useful on platforms where the ACPI _DSD cs-gpios property on the SPI controller is incomplete, but the peripheral's ACPI node does contain the correct GpioIo resource for its chip select. Suggested-by: Richard Fitzgerald Signed-off-by: Khalil --- drivers/spi/spi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index a0b2bd3b8..64be99d13 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -734,7 +734,8 @@ static int __spi_add_device(struct spi_device *spi, str= uct spi_device *parent) =20 for (idx =3D 0; idx < spi->num_chipselect; idx++) { cs =3D spi_get_chipselect(spi, idx); - spi_set_csgpiod(spi, idx, ctlr->cs_gpiods[cs]); + if (!spi_get_csgpiod(spi, idx)) + spi_set_csgpiod(spi, idx, ctlr->cs_gpiods[cs]); } } =20 --=20 2.43.0 From nobody Mon Jun 15 19:12:36 2026 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (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 4AB333B585D for ; Mon, 13 Apr 2026 10:02:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776074531; cv=none; b=FpQ5HW3UY6bQMhhgMAYiqevZLTmwRFwIJd4A+luX21Ja67YKFZq1ZMhiwhbD07vLsyBQpSfzeSNQ06ghBqyux4YClHr6iB3WM0gN7AQetmRehZ6lQmeB4ZsK69D+UjHWjQ6DExDaxSDyc+bqkUQ+/aJD1koJVMjJfIOtN7PBSJo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776074531; c=relaxed/simple; bh=Tclstug7hRiXGCPxAlH+OYkGPX8vCtXfLKlt8b4ukG4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jRWBwuZM94cESfIFaxu92FtyvgRCWEPYKUgKiKzvggf6Kbo0e6zdTUjlA9qPO048oKlBXPU0sEQowjHPkv4t7oS3Eg8LrIMreFk9D6njM2fQkngRv749IY3n3GglD4ZjpIPq3FsNjUX41Z3R6RMEzKm0P6omth9EZKffsqHFypk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JSxPmFDA; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JSxPmFDA" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-671a8476081so425663a12.2 for ; Mon, 13 Apr 2026 03:02:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776074526; x=1776679326; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WUQbeJrmnLAC83DjJTyOiwZ5gn/HwjrSl7M0Tq5ML7I=; b=JSxPmFDA63grQ1mUJ5blko/G4NQhpHvnrJCOUGgOK0hBuN6vMTtMnEBGy0MEEtr2j2 ZU6U2Adyh302rQfl460WwUh7z6oiGJxvvfezXwXKvAKMNrtOJ1D3O9Z/g621PNdl+MLM NjuOyDhChJQupkRQS7W1eoz6ZIeYsBcMs1f7ZPHfGipU6kGEupw/YCOVHA4j1K3hcEZN RD4iPUpwJkpUDk4S50r6J6rbY3cskcGJMeMrvvVC7l27gKRJOPnokrDIilRA+ifxdAbB W3+ecdkK7YGQnBrDxQAcoGm0ZFjJVAQDJsE9yECnC2jpQF/CB7bEk7kN7/dUYIZKpu1g btIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776074526; x=1776679326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WUQbeJrmnLAC83DjJTyOiwZ5gn/HwjrSl7M0Tq5ML7I=; b=D71zlpTwmv5lgNCSczbjaggvWDP2dUa6Q2sGWbtbdoEG5LD2vjl13Uzl9jsPlXbrQc gxrNGpUDFxlZBKommtFkxH9vZCPl8FXdjTF8pGLTTC4AvYij+Z01TZMPp8Hncez9W8Im PFczYDYzmHJ0dGSAtewnJ+z8FDAquBhifPMb7GG6P2SjN9A3lnlEORUlbs8YWfttlvDp eBd4Uu3xmElfYDccXw1ZbFvi+Ytqinst5gafsIKIlXafpSesUX8Bu6/inL2aQZS9c0le 0VWaEdZlHe4gZRe4x+EdvvldiP/UNwjm3z3lNI0TfSEtCr0IgdS9DMbtPxio03aQn3MB +E/g== X-Forwarded-Encrypted: i=1; AJvYcCWkEp1wU0LkXZ+Mo9aLhTed2PQMMOHbIHdAU38/pE8ntSPZzfDoEHuA+mym6CpmJGYOqbQ16iSm6EllRZk=@vger.kernel.org X-Gm-Message-State: AOJu0YyHo0sUahD2w0zbKHcGQLZWyYWvMl4cXwbjhCk2W6UcJKFQ+9IM Mmi5nJaldnbeeUlDVJTCxAFa5YTu1aQlUjJzw26SIB1V3tiw1FHncAZj X-Gm-Gg: AeBDietTTmdZMbNllo9PtVrbScxwf9nieH0BVznuwMftFIAXL1zVDbUCK8NtfmVt1BL 8gA1bfB75jRR4uayAuPXxVqVLjo0H5PUTqysjaftYAHl3mvKoyvlPce9xjpQAHHLRfKWYhuy2MI FMonoTcrsMhy96WA5vK8UuHqBolI0Y+KqlR5GLh9K14dR2SatPX5NrbE4rSiDT2Zv937fyLP/Pz AwuWhaWTK95QOOA5bEVxUiq0xRjPTPhifdfP0/3zOV1KxgkWRZH6DYEycrTgsWfjqi0mWyEAtlj WP0wPX315+WA9t6DLBBlZdy3PqKjxLgOnnsbQXvd+FP98EHNLDrGUy8MRITybMYq3oSPmztraFh cA/Tt0mE4kg4IS6uOzj+fQ04rKY1QevQiSAQN91RTXvhNTSGYoiHmSbTkf/lxkcCFxMR8gjJ0lI GRNHWmyNsQCByogsGmEyA9DQ== X-Received: by 2002:a17:907:c80e:b0:b9c:b475:90f4 with SMTP id a640c23a62f3a-b9d7297e98bmr682082966b.29.1776074526148; Mon, 13 Apr 2026 03:02:06 -0700 (PDT) Received: from khalil-hp.home ([62.250.67.33]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9d6e7f189esm291993566b.58.2026.04.13.03.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 03:02:05 -0700 (PDT) From: Khalil X-Google-Original-From: Khalil To: broonie@kernel.org, hdegoede@kernel.org, ilpo.jarvinen@linux.intel.com Cc: rf@opensource.cirrus.com, linux-spi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Khalil , Khalil Subject: [PATCH v2 2/3] platform/x86: serial-multi-instantiate: Fix SPI chip select on platforms with incomplete ACPI cs-gpios Date: Mon, 13 Apr 2026 12:01:39 +0200 Message-ID: <20260413100140.579845-3-khalil@rentman.nl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413100140.579845-1-khalil@rentman.nl> References: <20260413100140.579845-1-khalil@rentman.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some HP laptops with Intel Lunar Lake and dual Cirrus Logic CS35L56 amplifiers over SPI have an incomplete cs-gpios property in the SPI controller's _DSD - it only declares the first chip select. The remaining chip select GPIOs are defined as GpioIo resources in the peripheral's ACPI node but are not referenced by the controller. This causes the SPI framework to reject devices whose chip select exceeds num_chipselect with -EINVAL, preventing the second amplifier from probing. Fix this on known affected platforms by: 1. Adding a DMI quirk table to identify affected systems 2. For devices with chip selects outside the controller's range, acquiring the GPIO from the peripheral's ACPI GpioIo resource 3. Extending num_chipselect and reallocating the controller's cs_gpiods array to install the GPIO descriptor 4. Setting SPI_CONTROLLER_GPIO_SS so the framework calls both the GPIO toggle and controller->set_cs (needed for clock gating on Intel LPSS controllers) Only chip selects beyond the controller's num_chipselect are fixed up. Chip selects within range with a NULL cs_gpiods entry are left alone, as NULL means "native chip select" which is intentional. Tested on HP EliteBook 8 G1i 16 inch (board 8D8A) with 2x CS35L56 Rev B0 amplifiers. Both amplifiers probe and produce audio. Signed-off-by: Khalil --- .../platform/x86/serial-multi-instantiate.c | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/plat= form/x86/serial-multi-instantiate.c index 1a369334f..0d30bd0a7 100644 --- a/drivers/platform/x86/serial-multi-instantiate.c +++ b/drivers/platform/x86/serial-multi-instantiate.c @@ -8,6 +8,10 @@ =20 #include #include +#include +#include +#include +#include #include #include #include @@ -46,6 +50,53 @@ struct smi { int spi_num; struct i2c_client **i2c_devs; struct spi_device **spi_devs; + struct gpio_desc *cs_gpio; +}; + +/* + * Quirk data for platforms with broken ACPI SPI chip select descriptions. + * cs_gpio_idx: index of the GpioIo resource in the ACPI _CRS that provides + * the chip select GPIO for devices missing a proper cs-gpios + * entry on the SPI controller. + */ +struct smi_cs_gpio_quirk { + int cs_gpio_idx; +}; + +static const struct smi_cs_gpio_quirk hp_elitebook_8g1i_quirk =3D { + .cs_gpio_idx =3D 0, +}; + +/* + * DMI table of platforms with broken SPI chip select ACPI descriptions. + * + * These systems have multiple SPI peripherals (e.g., dual CS35L56 + * amplifiers) but the SPI controller's _DSD cs-gpios property is + * incomplete - it only declares the first chip select. The remaining + * chip select GPIOs are defined as GpioIo resources in the peripheral's + * ACPI node but are not referenced by the controller. + */ +static const struct dmi_system_id smi_cs_gpio_dmi_table[] =3D { + { + .ident =3D "HP EliteBook 8 G1i 16 inch", + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "HP"), + DMI_MATCH(DMI_BOARD_NAME, "8D8A"), + }, + .driver_data =3D (void *)&hp_elitebook_8g1i_quirk, + }, + { } +}; + +/* + * ACPI GPIO mapping for the chip select GpioIo resource. + * Maps "cs-gpios" to the GpioIo resource at index 0 of the ACPI _CRS. + */ +static const struct acpi_gpio_params smi_cs_gpio_params =3D { 0, 0, false = }; + +static const struct acpi_gpio_mapping smi_cs_gpio_mapping[] =3D { + { "cs-gpios", &smi_cs_gpio_params, 1 }, + { } }; =20 static int smi_get_irq(struct platform_device *pdev, struct acpi_device *a= dev, @@ -99,6 +150,101 @@ static void smi_devs_unregister(struct smi *smi) } } =20 +/* + * smi_spi_setup_cs_gpio - Fix up chip select for a device on a platform + * with broken ACPI cs-gpios description. + * + * On affected platforms, the SPI controller's cs-gpios property is incomp= lete, + * so the framework has no GPIO descriptor for some chip selects. This cau= ses + * __spi_add_device() to reject the device with -EINVAL (cs >=3D num_chips= elect). + * + * This function: + * 1. Extends num_chipselect if the device's CS is out of range + * 2. Reallocates cs_gpiods to match, preventing out-of-bounds access + * in __spi_add_device() + * 3. Installs the GPIO from the peripheral's ACPI node into the + * controller's cs_gpiods array so __spi_add_device() propagates + * it to the device + * 4. Sets SPI_CONTROLLER_GPIO_SS so the framework calls both the GPIO + * toggle and controller->set_cs (needed for clock gating on Intel + * LPSS controllers) + */ +static int smi_spi_setup_cs_gpio(struct device *dev, + struct spi_device *spi_dev, + struct smi *smi, + const struct smi_cs_gpio_quirk *quirk) +{ + struct spi_controller *ctlr =3D spi_dev->controller; + struct gpio_desc **new_gpiods; + u16 cs =3D spi_get_chipselect(spi_dev, 0); + + /* + * Only fix up chip selects that the controller doesn't know about. + * A NULL cs_gpiods[cs] within the controller's num_chipselect range + * means "native chip select" - that's intentional, not broken. + * The broken case is when cs >=3D num_chipselect, meaning the ACPI + * cs-gpios property on the controller was incomplete. + */ + if (cs < ctlr->num_chipselect) + return 0; + + /* Extend num_chipselect to cover this device */ + dev_info(dev, "Extending num_chipselect from %u to %u for CS%u\n", + ctlr->num_chipselect, cs + 1, cs); + ctlr->num_chipselect =3D cs + 1; + + /* Acquire the CS GPIO from the ACPI GpioIo resource if not yet done */ + if (!smi->cs_gpio) { + int ret; + + ret =3D devm_acpi_dev_add_driver_gpios(dev, smi_cs_gpio_mapping); + if (ret) { + dev_warn(dev, "Failed to add CS GPIO mapping: %d\n", ret); + return ret; + } + + smi->cs_gpio =3D devm_gpiod_get(dev, "cs", GPIOD_OUT_HIGH); + if (IS_ERR(smi->cs_gpio)) { + dev_warn(dev, "Failed to get CS GPIO: %ld\n", + PTR_ERR(smi->cs_gpio)); + smi->cs_gpio =3D NULL; + return -ENOENT; + } + dev_info(dev, "Acquired CS GPIO for CS%u from ACPI GpioIo[%d]\n", + cs, quirk->cs_gpio_idx); + } + + /* + * Reallocate the controller's cs_gpiods array to accommodate the + * new num_chipselect, and install the GPIO descriptor. This is + * necessary because __spi_add_device() unconditionally reads + * ctlr->cs_gpiods[cs] to set the device's cs_gpiod. + */ + new_gpiods =3D devm_kcalloc(&ctlr->dev, ctlr->num_chipselect, + sizeof(*new_gpiods), GFP_KERNEL); + if (!new_gpiods) + return -ENOMEM; + + if (ctlr->cs_gpiods) { + unsigned int i; + + for (i =3D 0; i < cs; i++) + new_gpiods[i] =3D ctlr->cs_gpiods[i]; + } + new_gpiods[cs] =3D smi->cs_gpio; + ctlr->cs_gpiods =3D new_gpiods; + + /* + * SPI_CONTROLLER_GPIO_SS ensures the framework calls both the + * GPIO CS toggle and controller->set_cs(). This is required on + * Intel LPSS controllers where set_cs handles clock gating. + */ + ctlr->flags |=3D SPI_CONTROLLER_GPIO_SS; + + dev_info(dev, "Installed GPIO CS on controller for CS%u\n", cs); + return 0; +} + /** * smi_spi_probe - Instantiate multiple SPI devices from inst array * @pdev: Platform device @@ -112,10 +258,19 @@ static int smi_spi_probe(struct platform_device *pdev= , struct smi *smi, { struct device *dev =3D &pdev->dev; struct acpi_device *adev =3D ACPI_COMPANION(dev); + const struct dmi_system_id *dmi_id; + const struct smi_cs_gpio_quirk *quirk =3D NULL; struct spi_controller *ctlr; struct spi_device *spi_dev; char name[50]; int i, ret, count; + u16 cs; + + dmi_id =3D dmi_first_match(smi_cs_gpio_dmi_table); + if (dmi_id) { + quirk =3D dmi_id->driver_data; + dev_info(dev, "Applying CS GPIO quirk for %s\n", dmi_id->ident); + } =20 ret =3D acpi_spi_count_resources(adev); if (ret < 0) @@ -139,6 +294,19 @@ static int smi_spi_probe(struct platform_device *pdev,= struct smi *smi, } =20 ctlr =3D spi_dev->controller; + cs =3D spi_get_chipselect(spi_dev, 0); + + /* + * On quirked platforms, fix up the chip select GPIO for + * devices that would otherwise fail due to incomplete + * ACPI cs-gpios on the SPI controller. + */ + if (quirk) { + ret =3D smi_spi_setup_cs_gpio(dev, spi_dev, smi, quirk); + if (ret) + dev_dbg(dev, "CS GPIO setup returned %d for CS%u\n", + ret, cs); + } =20 strscpy(spi_dev->modalias, inst_array[i].type); =20 --=20 2.43.0 From nobody Mon Jun 15 19:12:36 2026 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 36ECA3B6BEB for ; Mon, 13 Apr 2026 10:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776074532; cv=none; b=GyRD/iRYDk4RrfKa4uCyfybe5GDAEz2pMjSWap5YZHk8vtDpKsmU1MtbJNINnO3ZpGjnd8Ya1xNvU4Mjddapgf6q3EiJASXpjgnRQjKPU0kVoaSDlhOHhZJqDm9dY5Qx1WtQ69JL1gODhVbBpwiqMtFkQmFF2BuuReDYuLSaxiU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776074532; c=relaxed/simple; bh=A9NrOmrGg9D5qQPIJd3OHlgLpJRhg3BN4oaCn3ZDTsQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QIsKoDln4wb8+dAQhsMDo1DqYizTmcHKLMUj+OLI7LVinChf9YmCMvubx5EWRZqd9p4J79Md938wS8fnfsxAC0IgZaHqZDtC7u+c82EPOhnCA/YYvKwMnPumvl5mUU1LBGbN+sJJfApzxcY9dRAiD39PR00FjnOVgDKO+pJ7tYs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=i3kX2vjP; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="i3kX2vjP" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-b9e00649769so23393366b.3 for ; Mon, 13 Apr 2026 03:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776074529; x=1776679329; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bb0Cl07VkZM2TjR90yXu/+DWSboJw3nu1/V+vc9DpAw=; b=i3kX2vjPqb4dw2+yAD4LxUj6eqG1EuespiNOYx1WENBZZztTSacSLSiElfCOGODasX Lo91jrhYIY/skHDrURRZYcprRJwDyhOWSE233WjwuaauvQwfPCluWUfc3h0LBXW2C+rj El17rvvx5gzylZ5rb6g5mQami595mSqEgMhwlwojtN3b08uOS/A7NypXNLMAbGjGhk72 nazmzQfuAIFm4UGTzakNXCk4sHIDUld3MtLZRQyf8ujCw5du2IKOpApmIX8dtRQN+BGh fINtCCnweDl9gcGxwGc3bZFXSLDUi6F8P/WLCeylP6AaaNty7HM6BZLUJm6s5H3Yo7fM 4QVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776074529; x=1776679329; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=bb0Cl07VkZM2TjR90yXu/+DWSboJw3nu1/V+vc9DpAw=; b=Y+CxplQOLfger/2QJqdjQAFvPgyz3y4L2Wcf8YIMcvrKkgEi2n8ZPQIJ/fDWMKwt25 UEW028EK3uDkV3NqZcI5mmKl4EIE/C1MBWGGaSG7NDCl1d07KR2nGbcfN7Jv2QsAngUF ysZtDmxqEGldFAc0Crg/6nC6Vaa5o6JRD1RyTFkbMXprZWdIdkOZ3M4oR6zOIWz19M1q 5T/xY0iuwKs+/+dKEiKlR6flKha5jWzqRaOXOfn+OJVByFR4Dcuk5A0fk3PUUw9+XDqF jvLJjScTEA5JyDNNv+DSH26u6c63fCqgt8T/tWxaKTaaTxFLyXcJqqDo6JtzvVON2RML rinQ== X-Forwarded-Encrypted: i=1; AFNElJ8Aejhr+nkXynLPa96xJUXXL5wAyL4TkbhxnPlWu7GCwhDSZmOrZIBwOQi1+2uSG5tEywwKr03ew44Qakk=@vger.kernel.org X-Gm-Message-State: AOJu0YyCcNXiNaq4cvPQzv6wtu5vSH/rHSFdlNuc6QSS0K22EvW74elK 4okzerGXEwWA2HBhB6H4466OKZIF6J6AX5tn1Vg3kWbsLDCRBnAwJSh6 X-Gm-Gg: AeBDiesuE9xf9L/2OFUwb4gElgltaimE4AFtQs3GVbn1eZSw39zjReMCTNqZSW0ZXk8 BfEIZI6oacl8zG8a9WIJ8M17HcUyBZSSa3upUai9lX0TgwVfSV7jRDWvYYSOrlstqfHZJeJJWhB 6cmvhSh2FUd2jJc3r56PExKEpr8d9PRiLmULiPTQYseNuDosbLjPPHFRSKgzFtCAJA9AgN4w6SO 6AU2YkfALTCx9/LbfrmNQuZp1P28xuMhZGwYBvVUjhMc5A7OfQQXUsErpQTTqJMNo52kHtmRwoZ +O4k/jumLFmOai1XQA9dedMSSciAkz9QuSPA7tFBh6+J5/YLXZffltMbzt3i0P0uhKlgawypvBk XWA3GHSbJObc+uTDfnbK2QcLioyl3IohGsGQNpKumJxjenB0xB89c86lUvfhT6vkjNG/9qKWFzl 7uDHjd3ATY4W2ki9yPeTewxA== X-Received: by 2002:a17:907:a2c5:b0:b97:1009:7536 with SMTP id a640c23a62f3a-b9d72792d3amr700806166b.15.1776074529018; Mon, 13 Apr 2026 03:02:09 -0700 (PDT) Received: from khalil-hp.home ([62.250.67.33]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9d6e7f189esm291993566b.58.2026.04.13.03.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 03:02:06 -0700 (PDT) From: Khalil X-Google-Original-From: Khalil To: broonie@kernel.org, hdegoede@kernel.org, ilpo.jarvinen@linux.intel.com Cc: rf@opensource.cirrus.com, linux-spi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Khalil , Khalil Subject: [PATCH v2 3/3] spi: pxa2xx: Handle clock gating for GPIO chip select devices Date: Mon, 13 Apr 2026 12:01:40 +0200 Message-ID: <20260413100140.579845-4-khalil@rentman.nl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413100140.579845-1-khalil@rentman.nl> References: <20260413100140.579845-1-khalil@rentman.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On Intel LPSS SPI controllers (Cannon Lake and later) with dynamic clock gating (cs_clk_stays_gated=3Dtrue), the SPI clock is gated when no native chip select is asserted. When using a GPIO chip select (via SPI_CONTROLLER_GPIO_SS), the SPI framework toggles the GPIO and also calls the controller's set_cs callback. Handle this in the pxa2xx cs_assert/cs_deassert functions: when the device uses a GPIO chip select on an LPSS controller, assert native CS in the control register to enable the clock, and force the clock gate on. On deassert, restore both. This is needed on platforms where serial-multi-instantiate installs a GPIO chip select from the peripheral's ACPI GpioIo resource to work around an incomplete cs-gpios property on the SPI controller. Signed-off-by: Khalil --- drivers/spi/spi-pxa2xx.c | 45 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 6291d7c2e..fe5762063 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -419,20 +419,43 @@ static void cs_assert(struct spi_device *spi) { struct driver_data *drv_data =3D spi_controller_get_devdata(spi->controller); + const struct lpss_config *config; =20 if (drv_data->ssp_type =3D=3D CE4100_SSP) { pxa2xx_spi_write(drv_data, SSSR, spi_get_chipselect(spi, 0)); return; } =20 - if (is_lpss_ssp(drv_data)) - lpss_ssp_cs_control(spi, true); + if (is_lpss_ssp(drv_data)) { + config =3D lpss_get_config(drv_data); + + if (spi_is_csgpiod(spi)) { + /* + * GPIO handles the actual chip select to the device. + * On LPSS controllers with dynamic clock gating, the + * SPI clock won't run unless the native CS state says + * "asserted" in the CS control register. Assert native + * CS in the register to enable the clock, and force + * the clock gate on. + */ + lpss_ssp_cs_control(spi, true); + if (config->cs_clk_stays_gated) { + __lpss_ssp_update_priv(drv_data, + LPSS_PRIV_CLOCK_GATE, + LPSS_PRIV_CLOCK_GATE_CLK_CTL_MASK, + LPSS_PRIV_CLOCK_GATE_CLK_CTL_FORCE_ON); + } + } else { + lpss_ssp_cs_control(spi, true); + } + } } =20 static void cs_deassert(struct spi_device *spi) { struct driver_data *drv_data =3D spi_controller_get_devdata(spi->controller); + const struct lpss_config *config; unsigned long timeout; =20 if (drv_data->ssp_type =3D=3D CE4100_SSP) @@ -444,8 +467,22 @@ static void cs_deassert(struct spi_device *spi) !time_after(jiffies, timeout)) cpu_relax(); =20 - if (is_lpss_ssp(drv_data)) - lpss_ssp_cs_control(spi, false); + if (is_lpss_ssp(drv_data)) { + config =3D lpss_get_config(drv_data); + + if (spi_is_csgpiod(spi)) { + /* Deassert native CS and restore clock gating */ + lpss_ssp_cs_control(spi, false); + if (config->cs_clk_stays_gated) { + __lpss_ssp_update_priv(drv_data, + LPSS_PRIV_CLOCK_GATE, + LPSS_PRIV_CLOCK_GATE_CLK_CTL_MASK, + LPSS_PRIV_CLOCK_GATE_CLK_CTL_FORCE_OFF); + } + } else { + lpss_ssp_cs_control(spi, false); + } + } } =20 static void pxa2xx_spi_set_cs(struct spi_device *spi, bool level) --=20 2.43.0