From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 3F2BC3148C2; Thu, 16 Jul 2026 14:00:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784210454; cv=none; b=IlcdKpF2wM+eEnPtxvpQa9wGL0EvtyddyThSJykkUihttOspvdm+JHkuzU17WC31OuPvVMTQ3wiHcvUOlo74XwZUa+9V3Zzx69JZ3AgHY1t9YOHtTyXjN3LyVfEzpSei986UZx1Ssc+AOghoXHXN2aYPFxaJiV13wQS/k6UJWlA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784210454; c=relaxed/simple; bh=oSmiGqZ+NKR01Yzz3qAOklsl2MkVU8ST+IfMH9r+Emk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vEnOeojE4IpyT3fnzibGWiJ3DVYQFIpA/6xGu5WOXVzekp99G0maG9kxZhvl4eYd9vdCuE65mUouhS04CZTyj2s+5rj62KX3xQ6wOsXKCYHJssugi73g2wpDZ+cA7VTk7hjCs5PqLWfKXY36z+bxVfen3uXsDKeLduUEFP/nCOA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=snLLUNDv; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="snLLUNDv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3D821F000E9; Thu, 16 Jul 2026 14:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784210453; bh=0S6kepu3koNU7eozoc0VrNFoGynkZF7+WWjRopQYvbk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=snLLUNDvoW8iiJixppgtDMUpNUSJEjnL+dmt0gfUZPuMMQVYtmPfye8cuJ+UM3aRJ ngYSpjwrTidhXwQNVFqfOjUKEsJ1aYycr+9nBaOzi2LicduX5OOB1KowPfPaPjmRC6 JOKArxIe7Na8saBPNVAtSXGPDefkiDLpdroXW+dk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Radu Sabau , Stable@vger.kernel.org, Jonathan Cameron Subject: [PATCH 6.18 054/480] iio: adc: ad_sigma_delta: fix CS held asserted and state leaks Date: Thu, 16 Jul 2026 15:26:41 +0200 Message-ID: <20260716133045.880877532@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260716133044.672218725@linuxfoundation.org> References: <20260716133044.672218725@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Radu Sabau commit c72da0688575e5ef39c36bb44fed53aa18f8ae65 upstream. In ad_sigma_delta_single_conversion(), set_mode(AD_SD_MODE_IDLE) and disable_one() were called from the out: block while keep_cs_asserted was still true. This caused any SPI transfer issued by those callbacks to carry cs_change=1, leaving CS permanently asserted after the conversion. Fix by moving both calls into the out_unlock: block, after keep_cs_asserted is cleared, matching the pattern already used in ad_sd_calibrate(). In the error path of ad_sd_buffer_postenable(), if an operation fails after set_mode(AD_SD_MODE_CONTINUOUS) has already succeeded (e.g. spi_offload_trigger_enable()), the device is left in continuous conversion mode with CS physically asserted. Additionally, bus_locked remaining true after spi_bus_unlock() causes subsequent SPI operations to call spi_sync_locked() without the bus lock actually held, allowing concurrent SPI access. Fix the error path by clearing keep_cs_asserted first, then calling set_mode(AD_SD_MODE_IDLE) to revert the device mode and deassert CS, then clearing bus_locked before releasing the bus. For devices that implement neither set_mode nor disable_one (such as MAX11205, which has no physical CS pin), no SPI transfer is issued during cleanup and the cs_change flag has no effect on any physical line. Fixes: 132d44dc6966 ("iio: adc: ad_sigma_delta: Check for previous ready signals") Signed-off-by: Radu Sabau Cc: Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/iio/adc/ad_sigma_delta.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/drivers/iio/adc/ad_sigma_delta.c +++ b/drivers/iio/adc/ad_sigma_delta.c @@ -466,11 +466,10 @@ int ad_sigma_delta_single_conversion(str out: ad_sd_disable_irq(sigma_delta); - ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); - ad_sigma_delta_disable_one(sigma_delta, chan->address); - out_unlock: sigma_delta->keep_cs_asserted = false; + ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); + ad_sigma_delta_disable_one(sigma_delta, chan->address); sigma_delta->bus_locked = false; spi_bus_unlock(sigma_delta->spi->controller); out_release: @@ -603,6 +602,9 @@ static int ad_sd_buffer_postenable(struc return 0; err_unlock: + sigma_delta->keep_cs_asserted = false; + ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); + sigma_delta->bus_locked = false; spi_bus_unlock(sigma_delta->spi->controller); spi_unoptimize_message(&sigma_delta->sample_msg);