From nobody Sun Jun 14 22:58:32 2026 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.178]) (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 CFCFE3C343D for ; Tue, 7 Apr 2026 15:35:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775576168; cv=none; b=QLFhYWMhZkW9qTUzRUe5OclOLeZTTFrLrSyGBpOsWvqvc1CZSvHiaokmhVCvRtVcgFR1khqQzeOpdXCRq6d8p0lmXWqvZy5OQe7HYhpm1PaExD7oNEbQL8+7UzHwmn5EEk3eT0e/jOvZjolnBuir1qbwRwrow7tVHqcEbQnNcSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775576168; c=relaxed/simple; bh=dB7P+hW2P2i24SpsF7yvWCHcLNtwvsI1lS/8EmcxB48=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YBK3sqUbCOSica1C16IfkwhHTH2zNipsr5g+GV2UZUVQ+HP9xSxeEXuIJ5+Xg3GtUKMmLuj9YJOldGJRWKsEbA2typzr1YO0Q/V7PlWTX7ybxCegY4pUxE6YhUhcnKBmeSDGyQe4b+MccMtVigDLYOhgBJZpBAg1SxBRVIOxQdQ= 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=bTGuVCe7; arc=none smtp.client-ip=74.125.82.178 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="bTGuVCe7" Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-2c15849aa2cso6928475eec.0 for ; Tue, 07 Apr 2026 08:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775576153; x=1776180953; 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=9xrYsGshoqQIuVHI2ZhqhKCWB+xMWS+Wc13rrkqN5sw=; b=bTGuVCe7EtqSdDy+HICYc/lYgIaTdVn/MANLlAITPZUZB9XtFmX+0B9bnhLHUJe3c/ BuxawuhFGnjLQN45I01mQ4gp6K0sLt0ryP2mOw/Wb78Hew/wrGsRKLueY4Pw+D/TBb5R T/cCp4xULGi6KDj0J60rFCXTE3FrF9/VlwGX/rgTc+0eXfbFnaGo6bSO+7vn7Pyi5I+Y cSFJWYrSFHMNF8gvrDsSsv9Hr3EHncnGnZRm8vjVhQq24E5wf5L3FsOD7HDEGdlkJm/O DVHCXEEeCs+Ba5abBzwvfJYLvI+WaMIB0Kl9VSGiXJafOadU8TmY4WlVCziq/mN1+Dk7 /kjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775576153; x=1776180953; 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=9xrYsGshoqQIuVHI2ZhqhKCWB+xMWS+Wc13rrkqN5sw=; b=K9OchhuY/FWhTFPEHbuj1S6kb1zYtrxFCcfOhmtaaCZn2F8ngzeBtPkjbkaHfIbx9/ ZyjEZjgXJJZ7+8uZ4VaDLMQbTFK33NDj/zzIzIsxkZcoVOwZ5MR/B8nRPVL9leMDpYX2 o5V+6EnLmt/Y/EbYa51JE5RUL90wsfNXzrlU70atKlahcqHobIFKDWLe4VrA8wJfmwWS FS8A/EvAiKQwqvwZkD+BxIXsaXqXzJv/uq8gcQ4+AYcWerU/fEiWzFUZTeYA+hK4tUAG agDlzXs84InQdzonJyAFv2vzeNZgv0mEKz7CVzLNtejSA+wJkdOYPGwcU60UixO91Z8a UeJw== X-Forwarded-Encrypted: i=1; AJvYcCXYM4blVm2g3L21EH2z6Q7Jnc/5MJtRwHUXXXYQKfTMrmoDnDhtbdzV9L7wsvhzgbX4vx5fpf4iYMJ7t3g=@vger.kernel.org X-Gm-Message-State: AOJu0Yzd/NPi578sUUYHwQgctgs3E9zS7xEb3H18YXOTMrlTX3f0ZNLa Ft0vYc1oyffHWi/IdFoRjBseChOi74BiKUmz4WeNU/K00WzzIB112MamdcimhA== X-Gm-Gg: AeBDiesBYF9lm+SBhvtOLTGJO6VaKIWp80IC0BNv8ztqIUGFNGSwj8aiBcmDyQI0U/6 NJJZWJj5HqeL1qprZEROO3M4dIOiQrRdvFMalE1m7eplX4vsP9B8bSxX9o9KfB5ugVBXE3CptFO iKRfNSxu1NfrBZYeLijwMFk4Uux4EriasngM3f2HjIhQ0qZ0FZ3GdnogzjQSZDQOJI8Knz4VFKD rU+Co0Xd32biqSOMK/wLmDmEfccQTFd1HK5BOYS8JfwjW2m4yghGcFNb6cdL0LzFZP+bHQUTwob NFHIkimtQl7V4Memkk4KoboLb5S+5OzpqPq+f4Dfy6DiAmx13W72wskZuHJ6tSE7AuYRxoSC1E9 tphruZr+yA/c5N0JWAY4CG77MSZXOV21mce13w9rJidMWQjwhdif8LZNVp93//sKePdMT2ypKIe r6vtO4+7CstWVxxd+w6XqectybDEmLMNgCF0tG8G8E8p3EenvXDfeJmn4E7v/3KMEJ8jltgECg+ ZauLwIYDneJD80= X-Received: by 2002:a05:7300:5725:b0:2c5:60d0:703b with SMTP id 5a478bee46e88-2cbfa5be05emr10028670eec.14.1775576152862; Tue, 07 Apr 2026 08:35:52 -0700 (PDT) Received: from [192.168.1.18] (177-4-161-167.user3p.v-tal.net.br. [177.4.161.167]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2d1b152f3adsm2918397eec.20.2026.04.07.08.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 08:35:52 -0700 (PDT) From: =?utf-8?q?C=C3=A1ssio_Gabriel?= Date: Tue, 07 Apr 2026 12:35:41 -0300 Subject: [PATCH v2 1/3] ALSA: tea6330t: move snd_tea6330t_detect() EXPORT_SYMBOL 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: <20260407-alsa-interwave-pm-v2-1-8dd96c6129e9@gmail.com> References: <20260407-alsa-interwave-pm-v2-0-8dd96c6129e9@gmail.com> In-Reply-To: <20260407-alsa-interwave-pm-v2-0-8dd96c6129e9@gmail.com> To: Takashi Iwai , Jaroslav Kysela Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?C=C3=A1ssio_Gabriel?= X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=923; i=cassiogabrielcontato@gmail.com; h=from:subject:message-id; bh=dB7P+hW2P2i24SpsF7yvWCHcLNtwvsI1lS/8EmcxB48=; b=owGbwMvMwCV2IdZeKur/u2bG02pJDJlXVYIkb9VKBF8Sf7KE93JkkPskC2HZgyl5C1fz/Hnhq 8Q5cemzjlIWBjEuBlkxRZbVSYss93Q9uFoft8IDZg4rE8gQBi5OAZjI9FcMf/g62+uU1dZVTj1S wsu3pM/4Shn/g3v7Q1k3mW/YPuHVHwGG/7F2D+QVoy001vlccG6Yra2+fpp3k1pDw/qK+m3rKn7 95AYA X-Developer-Key: i=cassiogabrielcontato@gmail.com; a=openpgp; fpr=AB62A239BC8AE0D57F5EA848D05D3F1A5AFFEE83 Move the remaining standalone snd_tea6330t_detect() EXPORT_SYMBOL() declaration next to its function definition so tea6330t.c follows the usual layout. No functional change intended. Signed-off-by: C=C3=A1ssio Gabriel --- sound/i2c/tea6330t.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c index e8c50a036bea..5341907b85d1 100644 --- a/sound/i2c/tea6330t.c +++ b/sound/i2c/tea6330t.c @@ -51,6 +51,7 @@ int snd_tea6330t_detect(struct snd_i2c_bus *bus, int equa= lizer) snd_i2c_unlock(bus); return res; } +EXPORT_SYMBOL(snd_tea6330t_detect); =20 #if 0 static void snd_tea6330t_set(struct tea6330t *tea, @@ -356,5 +357,4 @@ int snd_tea6330t_update_mixer(struct snd_card *card, return err; } =20 -EXPORT_SYMBOL(snd_tea6330t_detect); EXPORT_SYMBOL(snd_tea6330t_update_mixer); --=20 2.53.0 From nobody Sun Jun 14 22:58:32 2026 Received: from mail-dl1-f50.google.com (mail-dl1-f50.google.com [74.125.82.50]) (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 7836F3C454D for ; Tue, 7 Apr 2026 15:35:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775576164; cv=none; b=g+IIgQW9dyW1h+M1Lg37f/q+BqedRy5BOGzEt1zLdn/vu+LN4arRbZL/je58FmzALl4iWY4D0ZJ09nvm8Xk8lBqw0eLKk6lskjPo1CWbchklAONEX9Gw5Zmx93+oZzyI0UToZthNtjYByIylfyXxAv03jbNFdD4GstMbSS8fp9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775576164; c=relaxed/simple; bh=dr9NNaPgzVLX/zcwEHihdZJ0bQ47V8p9Qe3DikgzCnU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Yo4genUceEidteihdjKaZiId0YKpApTHjUIkZ7UVu3X8HertyOUsZaKI2bgujFDCiiLBBxMGVJno5rxTgMQg7D5Wptq3GnYMLHlpIkl2+zFHMB21/HfLegP89jSpa5chg6cHk5EUngyDt65WFvgtnGT9guAQUDevWqFdQL4I6D8= 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=sRAIQ+JY; arc=none smtp.client-ip=74.125.82.50 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="sRAIQ+JY" Received: by mail-dl1-f50.google.com with SMTP id a92af1059eb24-12c0b72daf7so1458207c88.0 for ; Tue, 07 Apr 2026 08:35:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775576156; x=1776180956; 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=MjRb6q+G4O7wtmDOLW3dJ2X62b3Z+1AffOhEFuKUzJU=; b=sRAIQ+JY/NSSioku6Itd95Xdgbda43o2uZUoSkAscPKWj1+AyxIYuaAth6/qYG+dZt FQNPl8OzcY0441b4SsJqq+nRtHkBx37tfwhyiE525mwGJIiZlt81Mqw1ZJ/EnlLRzhe8 xuq2zA9eP1d71GOdv3a+YKdln9SVKzqlJir7vpOx6uBY030dfc3Gk93CyT2PbrJoKieM hA6xjVzD6UqQPelTMCNmibACT8PessD/6WDY0SxLDBHNnGTYcnH1jCGCaJETLUKcVSAH 2KzM/PhDK/TKC/wT+EkbS3P0rt4Yf81efv384pcvHLTVh2JYKN48vPUayhgnoCmmUzxw HU9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775576156; x=1776180956; 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=MjRb6q+G4O7wtmDOLW3dJ2X62b3Z+1AffOhEFuKUzJU=; b=EukdrFMu0Db2oGyfq2Cqks+1IEqh6ecZVYGMxkoaqEly97ZcHH2oekVd0UG/xMswO+ IfG91SqXvkDwdNz52LCjfcebq+1aExoRD3tmSoOgth+oLvo1AoIE5dbKpf71huWCsqov ZguIbsq0CeAiGewXgURvTvR6pa/HbRv1Tc5X3XAcl/zRnwrtqo0iF4iu5s8be3dNzz0C afJaRp8l+4EKxcVo6EW05noklSN2gz8dtZH0nGlWhofZJi5NCLB43IioY9fRg34o0qU3 FV7D5f0Kkeg9MH72u8UtjudWsp+uuugTW7jE+LueE7V0xcw28oHE8FQqasEQGoxXrLN9 EDlg== X-Forwarded-Encrypted: i=1; AJvYcCUlPGDIjcedS0ucD/a6EtuWgiOcrs/t1Kt7ddv7VJC/AE8rAchh7S2Lkvkgz2ClYpWT22bIEIQ313Dunic=@vger.kernel.org X-Gm-Message-State: AOJu0YypE5kHJtaZ2qT60YTOPblRRuFg1X7LimRMibBL7PGt1miwvEj+ J5PiFYxklD5hpEdCUFjOJcnYJpHfiaIsr6iptHk2EvGt72l1OmYerbqs94sZfQ== X-Gm-Gg: AeBDievOc5gnO1sa+mVO/OSXRVoj88kGlS4uDBR1L9swn8VxW3pxTHNLq0DDLwFXq21 Ciy9ivZNXwJfnGgAqn2xANIBGdlBcifQ7SfBc/wZufZT1d+eCrC3pxe9h1CkfJl2X5fXdC418gz nENBWzxqiOvBNDeod3xQTaueqfqPBOSItfcmPlu7YYzQvb+gEjHQrHfu2Wqc80LkLcURrvTYmtg QlAhLJOb9XtFHS6H5OBmA9xxKbqsKLA/xpLOqPhv3uiC+0Y0TO8bn5RmnqAaQzpK0Ub0Dfe4rsR LNQ+JBcHYOZdn94ym+l3oR33sIcyVn35UgKlKD+RnsbPxADPsjk8f1FQUzEPcy0DoA0LzLqukb3 PrGmCo2ghQzihAO5U2EMoxhEWeMJR2d9ykFaHzazvW/7zy9ofUCp937riJyL51kgUJv+kopw6Cs 1G0npE8VZvsYYx87iw38zSStKGdXm6ulmDiTyXXv6M4fYk9UGxOiGbF6Mf8sxv+Bzp/EucMF6VP sC7 X-Received: by 2002:a05:7300:6d07:b0:2c4:ec89:be7 with SMTP id 5a478bee46e88-2cbfc07386emr10247322eec.23.1775576156001; Tue, 07 Apr 2026 08:35:56 -0700 (PDT) Received: from [192.168.1.18] (177-4-161-167.user3p.v-tal.net.br. [177.4.161.167]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2d1b152f3adsm2918397eec.20.2026.04.07.08.35.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 08:35:55 -0700 (PDT) From: =?utf-8?q?C=C3=A1ssio_Gabriel?= Date: Tue, 07 Apr 2026 12:35:42 -0300 Subject: [PATCH v2 2/3] ALSA: tea6330t: add mixer state restore helper 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: <20260407-alsa-interwave-pm-v2-2-8dd96c6129e9@gmail.com> References: <20260407-alsa-interwave-pm-v2-0-8dd96c6129e9@gmail.com> In-Reply-To: <20260407-alsa-interwave-pm-v2-0-8dd96c6129e9@gmail.com> To: Takashi Iwai , Jaroslav Kysela Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?C=C3=A1ssio_Gabriel?= X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2357; i=cassiogabrielcontato@gmail.com; h=from:subject:message-id; bh=dr9NNaPgzVLX/zcwEHihdZJ0bQ47V8p9Qe3DikgzCnU=; b=owGbwMvMwCV2IdZeKur/u2bG02pJDJlXVYJUIp8vvvfz9f/ZxnciHubukJDRcl+5PixlWiSHN tM0QcdFHaUsDGJcDLJiiiyrkxZZ7ul6cLU+boUHzBxWJpAhDFycAjARjXcMPxlbn29ITlsy+4jG QuEPfQrvu9fFzC1wq171wWXZ98wfv7czMuybcWJFzZRwia1ThLIFrV3LpzXcLn5xpX3T54x971L enGEEAA== X-Developer-Key: i=cassiogabrielcontato@gmail.com; a=openpgp; fpr=AB62A239BC8AE0D57F5EA848D05D3F1A5AFFEE83 The InterWave STB variant uses a TEA6330T mixer on its private I2C bus. The mixer state is cached in software, but there is no helper to push that register image back to hardware after system resume. Add a small restore helper that reapplies the cached TEA6330T register image to the device so board drivers can restore the external mixer state as part of their PM resume path. Take snd_i2c_lock() around the full device lookup and restore sequence so the bus device list traversal is also protected. Signed-off-by: C=C3=A1ssio Gabriel --- include/sound/tea6330t.h | 1 + sound/i2c/tea6330t.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/include/sound/tea6330t.h b/include/sound/tea6330t.h index 1c77b78f6533..3a34033d2aa3 100644 --- a/include/sound/tea6330t.h +++ b/include/sound/tea6330t.h @@ -12,5 +12,6 @@ int snd_tea6330t_detect(struct snd_i2c_bus *bus, int equalizer); int snd_tea6330t_update_mixer(struct snd_card *card, struct snd_i2c_bus *b= us, int equalizer, int fader); +int snd_tea6330t_restore_mixer(struct snd_i2c_bus *bus); =20 #endif /* __SOUND_TEA6330T_H */ diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c index 5341907b85d1..39c5e87c6ab0 100644 --- a/sound/i2c/tea6330t.c +++ b/sound/i2c/tea6330t.c @@ -356,5 +356,42 @@ int snd_tea6330t_update_mixer(struct snd_card *card, snd_i2c_device_free(device); return err; } - EXPORT_SYMBOL(snd_tea6330t_update_mixer); + +int snd_tea6330t_restore_mixer(struct snd_i2c_bus *bus) +{ + struct snd_i2c_device *device; + struct tea6330t *tea; + unsigned char bytes[7]; + unsigned int idx; + int err; + + if (!bus) + return -EINVAL; + + snd_i2c_lock(bus); + list_for_each_entry(device, &bus->devices, list) { + if (device->addr !=3D TEA6330T_ADDR) + continue; + + tea =3D device->private_data; + if (!tea) { + err =3D -EINVAL; + goto unlock; + } + + bytes[0] =3D TEA6330T_SADDR_VOLUME_LEFT; + for (idx =3D 0; idx < 6; idx++) + bytes[idx + 1] =3D tea->regs[idx]; + err =3D snd_i2c_sendbytes(device, bytes, 7); + err =3D err < 0 ? err : 0; + goto unlock; + } + + err =3D -ENODEV; + +unlock: + snd_i2c_unlock(bus); + return err; +} +EXPORT_SYMBOL(snd_tea6330t_restore_mixer); --=20 2.53.0 From nobody Sun Jun 14 22:58:32 2026 Received: from mail-dl1-f48.google.com (mail-dl1-f48.google.com [74.125.82.48]) (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 438843C2797 for ; Tue, 7 Apr 2026 15:36:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775576170; cv=none; b=d4BFHMZ/XnIMEcmLn6b+/yDaVBjToqexqwBvFABGRnbs0zXASPqGSN7+MCuWcJBxUnJ3e1miW7QHcajQmpWr1lVGTzgSTHPW5VANYrt/t1tIJwyW89C5R4fUt0kz3ozlueU1cmVB6rqmIBiESPse//v7MinlA0EItW80V9x341U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775576170; c=relaxed/simple; bh=4Y9CqXMn8U69M84oxZ10Kqm4IkJzKs8xnoSjmQa3AR0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gddvDx9xTT60j43qBz7Un7pDhLbiXtDFTjfQ9XkaGN+BEXjMbEIAKIggcTM9YIzTHd927XRV+RZCgPl0c+ffzHtVN74CnOLSNKN9Ppx6Fgplx0TkdwLbluSxdCXeg70U93QsHvlfqfBRAvTo5QY+mRsHxtVKC8tutJpxUeXgr58= 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=OLp2mL64; arc=none smtp.client-ip=74.125.82.48 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="OLp2mL64" Received: by mail-dl1-f48.google.com with SMTP id a92af1059eb24-12776bebe9fso816382c88.1 for ; Tue, 07 Apr 2026 08:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775576159; x=1776180959; 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=8XQbGkefogy11J2Mc9HHAVdzevhbE9LurfcwHxWmPT0=; b=OLp2mL64sy0kM0DZW2ZcYeBa6ZxYC3aQ8K62kRU7DLAKfld/rMbnsl/jxKYitEGDWx N1BirvgvgEpj/5WWILeNiGhB5Pw3i8xLQpF/9dsY9HYuNDI40BE66VSGunGEd02sC5aE j9GkQPqshs9vnrGM+5efkwWmA8kmHCokhdjY+Zm7ZJpGwC5jo6GnVQ+fkyMT9rkrHtae uqLMXw7ymntmAz7HusxL1ATv7Hf8ClElCAFZdznmspOAbuIUCGWr/uk3zZklz6Sz7Thr u6i2jrS8Y233p8YL22fLdxRQj/jFYGjgnwBxLro6AFqxmhNzj62TEB5W1zL4roT+SEot oXAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775576159; x=1776180959; 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=8XQbGkefogy11J2Mc9HHAVdzevhbE9LurfcwHxWmPT0=; b=Ji5+WH0eKhiPc5lmCg7hsrtH+KLetaUAg783iKjriocm9w/nIbnduv50uiOfBlYayl 4TKl2aatiJRjqXq/VkMFJK02pPWP5nQTeLEboClA0deIUII61RQXaSjGFb2aSSqdCvti PTLRi4Tc94EdWmLMg1xrb3cZKAMGIKFxVWZroyP5HvUyt842+9p9pWMU0DqsOEqzj8vc cgahd51qcQMg3h/PrjLqljCN/FefOBdGqJBK0CJeDcmrwOM6bzzKC2NX0gHbPMQuIG5C 8QF/hJaSgMXqTVDnXLm4LyCr31FkgyJ9wCNHI+RVmTE+gnoAQeupEiZWuvbysTuhp2hO Z35Q== X-Forwarded-Encrypted: i=1; AJvYcCV7j0HdJtm/2a2HjBVkU6pWwuuNVXAnSYgkugDTloyUKGiCWHRQ0v50hAI6ZPl11EsT25nLxY37p2QVkZc=@vger.kernel.org X-Gm-Message-State: AOJu0YxzaSwyIpW+npNeZuuTgqY09BgpzF/Sd4L8cwjceZTgVhWTQQF1 8xVVprySE0MidYwxN1KhsPtMcTzNCZNiqdZ0g2tuMkybhrcMOTskAbHY8Gau9w== X-Gm-Gg: AeBDiesZueXVEpF1fshEgQB7DA9NxmODKw2z18EDtvdOPJmQPqR5CVA0taSn2Mmhy9d uIr3VeVrWAofhEaB+6JRLV+bIOebzyHoL9kVM4pSKlVdXbc7chdVzy4w0NADdNEHcVK1zhz/Sdi aMUVf0Qr2VY2Bien3MhiQrgcfkuvyG5wrrTHgMSNu0XhPSgYkRfMv/PAT296pYk5490cnjXqkts W9wNOAgAtLIO0VXq05aOl70jcGZjEVrTFrRTjFlfpqGxchCG9O9oSrqmEFYNQRJQzzKuOo1+iDx 0XU+KaQDA48fJXNXNhgXmPFK79y8Dk2nKppjec88mXeNPsRHTR4BAAGpij2TLCahTGY4peWj0dn i/BtnqJ371010OgPXlQpj/FZgLDc9FIxoXf0Cw2IdlkF11UTm8yCJemU9KWriwzfiq/H6WM67Kc 7D59s2x0L8DEW7Rwx5rKL76CysXrIxnl2nBEWJIFLGgc0HoZE6hFxfZjqRaim9a88TRyQEbMQKT 1gjEBS9irGW68c= X-Received: by 2002:a05:7300:2405:b0:2cc:4951:37c5 with SMTP id 5a478bee46e88-2cc495161b9mr6748145eec.1.1775576159151; Tue, 07 Apr 2026 08:35:59 -0700 (PDT) Received: from [192.168.1.18] (177-4-161-167.user3p.v-tal.net.br. [177.4.161.167]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2d1b152f3adsm2918397eec.20.2026.04.07.08.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 08:35:58 -0700 (PDT) From: =?utf-8?q?C=C3=A1ssio_Gabriel?= Date: Tue, 07 Apr 2026 12:35:43 -0300 Subject: [PATCH v2 3/3] ALSA: interwave: add ISA and PnP suspend and resume callbacks 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: <20260407-alsa-interwave-pm-v2-3-8dd96c6129e9@gmail.com> References: <20260407-alsa-interwave-pm-v2-0-8dd96c6129e9@gmail.com> In-Reply-To: <20260407-alsa-interwave-pm-v2-0-8dd96c6129e9@gmail.com> To: Takashi Iwai , Jaroslav Kysela Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?C=C3=A1ssio_Gabriel?= X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=9075; i=cassiogabrielcontato@gmail.com; h=from:subject:message-id; bh=4Y9CqXMn8U69M84oxZ10Kqm4IkJzKs8xnoSjmQa3AR0=; b=owGbwMvMwCV2IdZeKur/u2bG02pJDJlXVYL5lmTPnfxAzInBvXOzFP/2eTnd7wonNsslRYYVe e/sCYnoKGVhEONikBVTZFmdtMhyT9eDq/VxKzxg5rAygQxh4OIUgImEiDEy3PORrqpkvfeMz0JM cOvcuv29ubxhOS3+l8ybZO/7G5wVZfif8vTnavOUaW4dXcpnFzm6vSr42M4tvmIdG/ehe7MV2lb xAAA= X-Developer-Key: i=cassiogabrielcontato@gmail.com; a=openpgp; fpr=AB62A239BC8AE0D57F5EA848D05D3F1A5AFFEE83 interwave still leaves both its ISA and PnP PM callbacks disabled even though the shared GUS suspend and resume path now exists. This board needs InterWave-specific glue around the shared GUS PM path. The attached WSS codec has its own register image that must be saved and restored across suspend, the InterWave-specific GF1 compatibility, decode, MPU401, and emulation settings must be rewritten after the shared GF1 resume path reinitializes the chip, and the probe-detected InterWave memory layout must be restored without rerunning the destructive DRAM/ROM detection path. Track the optional STB TEA6330T bus at probe time, restore its cached mixer state after resume, add resume-safe helpers for the InterWave register and memory-configuration state, and wire both the ISA and PnP front-ends up to the shared GUS PM helpers. The resume path intentionally restores only the cached hardware setup. It does not attempt to preserve sample RAM contents across suspend. Signed-off-by: C=C3=A1ssio Gabriel --- sound/isa/gus/interwave.c | 178 +++++++++++++++++++++++++++++++++++++++---= ---- 1 file changed, 151 insertions(+), 27 deletions(-) diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index 18adcd35e117..616c11e51a2f 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c @@ -96,6 +96,7 @@ struct snd_interwave { struct snd_gus_card *gus; struct snd_wss *wss; #ifdef SNDRV_STB + struct snd_i2c_bus *i2c_bus; struct resource *i2c_res; #endif unsigned short gus_status_reg; @@ -363,18 +364,30 @@ struct rom_hdr { /* 511 */ unsigned char csum; }; =20 -static void snd_interwave_detect_memory(struct snd_gus_card *gus) +static const unsigned int snd_interwave_memory_configs[] =3D { + 0x00000001, 0x00000101, 0x01010101, 0x00000401, + 0x04040401, 0x00040101, 0x04040101, 0x00000004, + 0x00000404, 0x04040404, 0x00000010, 0x00001010, + 0x10101010 +}; + +static int snd_interwave_find_memory_config(unsigned int lmct) { - static const unsigned int lmc[13] =3D - { - 0x00000001, 0x00000101, 0x01010101, 0x00000401, - 0x04040401, 0x00040101, 0x04040101, 0x00000004, - 0x00000404, 0x04040404, 0x00000010, 0x00001010, - 0x10101010 - }; + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(snd_interwave_memory_configs); i++) { + if (lmct =3D=3D snd_interwave_memory_configs[i]) + return i; + } + + return -EINVAL; +} =20 +static void snd_interwave_detect_memory(struct snd_gus_card *gus) +{ int bank_pos, pages; unsigned int i, lmct; + int lmc_cfg; int psizes[4]; unsigned char iwave[8]; unsigned char csum; @@ -399,17 +412,20 @@ static void snd_interwave_detect_memory(struct snd_gu= s_card *gus) #if 0 dev_dbg(gus->card->dev, "lmct =3D 0x%08x\n", lmct); #endif - for (i =3D 0; i < ARRAY_SIZE(lmc); i++) - if (lmct =3D=3D lmc[i]) { + lmc_cfg =3D snd_interwave_find_memory_config(lmct); + if (lmc_cfg >=3D 0) { #if 0 - dev_dbg(gus->card->dev, "found !!! %i\n", i); + dev_dbg(gus->card->dev, "found !!! %i\n", lmc_cfg); #endif - snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, (snd_gf1_look16(gus, = SNDRV_GF1_GW_MEMORY_CONFIG) & 0xfff0) | i); - snd_interwave_bank_sizes(gus, psizes); - break; - } - if (i >=3D ARRAY_SIZE(lmc) && !gus->gf1.enh_mode) - snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, (snd_gf1_look16(gus, = SNDRV_GF1_GW_MEMORY_CONFIG) & 0xfff0) | 2); + snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, + (snd_gf1_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG) & 0xfff0) | + lmc_cfg); + snd_interwave_bank_sizes(gus, psizes); + } else if (!gus->gf1.enh_mode) { + snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, + (snd_gf1_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG) & 0xfff0) | + 2); + } for (i =3D 0; i < 4; i++) { gus->gf1.mem_alloc.banks_8[i].address =3D gus->gf1.mem_alloc.banks_16[i].address =3D i << 22; @@ -454,24 +470,66 @@ static void snd_interwave_detect_memory(struct snd_gu= s_card *gus) snd_interwave_reset(gus); } =20 +static void __snd_interwave_restore_regs(struct snd_gus_card *gus) +{ + snd_gf1_write8(gus, SNDRV_GF1_GB_COMPATIBILITY, 0x1f); + snd_gf1_write8(gus, SNDRV_GF1_GB_DECODE_CONTROL, 0x49); + snd_gf1_write8(gus, SNDRV_GF1_GB_VERSION_NUMBER, 0x11); + snd_gf1_write8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A, 0x00); + snd_gf1_write8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B, 0x30); + snd_gf1_write8(gus, SNDRV_GF1_GB_EMULATION_IRQ, 0x00); +} + +static void snd_interwave_restore_regs(struct snd_gus_card *gus) +{ + scoped_guard(spinlock_irqsave, &gus->reg_lock) + __snd_interwave_restore_regs(gus); +} + +static void snd_interwave_restore_memory(struct snd_gus_card *gus) +{ + unsigned short mem_cfg; + unsigned int lmct =3D 0; + int i, lmc_cfg; + + if (!gus->gf1.memory) + return; + + for (i =3D 0; i < 4; i++) + lmct |=3D (gus->gf1.mem_alloc.banks_16[i].size >> 18) << (i * 8); + + lmc_cfg =3D snd_interwave_find_memory_config(lmct); + if (lmc_cfg < 0) { + if (!gus->gf1.enh_mode) { + lmc_cfg =3D 2; + } else { + dev_warn(gus->card->dev, + "cannot restore InterWave memory layout 0x%08x\n", + lmct); + return; + } + } + + scoped_guard(spinlock_irqsave, &gus->reg_lock) { + mem_cfg =3D snd_gf1_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG); + mem_cfg =3D (mem_cfg & 0xfff0) | lmc_cfg; + mem_cfg =3D (mem_cfg & 0xff1f) | (4 << 5); + snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, mem_cfg); + } +} + static void snd_interwave_init(int dev, struct snd_gus_card *gus) { - /* ok.. some InterWave specific initialization */ + /* Probe-time setup also clears the timer control register. */ scoped_guard(spinlock_irqsave, &gus->reg_lock) { snd_gf1_write8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL, 0x00); - snd_gf1_write8(gus, SNDRV_GF1_GB_COMPATIBILITY, 0x1f); - snd_gf1_write8(gus, SNDRV_GF1_GB_DECODE_CONTROL, 0x49); - snd_gf1_write8(gus, SNDRV_GF1_GB_VERSION_NUMBER, 0x11); - snd_gf1_write8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A, 0x00); - snd_gf1_write8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B, 0x30); - snd_gf1_write8(gus, SNDRV_GF1_GB_EMULATION_IRQ, 0x00); + __snd_interwave_restore_regs(gus); } gus->equal_irq =3D 1; gus->codec_flag =3D 1; gus->interwave =3D 1; gus->max_flag =3D 1; gus->joystick_dac =3D joystick_dac[dev]; - } =20 static const struct snd_kcontrol_new snd_interwave_controls[] =3D { @@ -724,6 +782,7 @@ static int snd_interwave_probe(struct snd_card *card, i= nt dev, err =3D snd_tea6330t_update_mixer(card, i2c_bus, 0, 1); if (err < 0) return err; + iwcard->i2c_bus =3D i2c_bus; } #endif =20 @@ -828,10 +887,59 @@ static int snd_interwave_isa_probe(struct device *pde= v, return 0; } =20 +#ifdef CONFIG_PM +static int snd_interwave_card_suspend(struct snd_card *card) +{ + struct snd_interwave *iwcard =3D card->private_data; + + iwcard->wss->suspend(iwcard->wss); + return snd_gus_suspend(iwcard->gus); +} + +static int snd_interwave_card_resume(struct snd_card *card) +{ + struct snd_interwave *iwcard =3D card->private_data; + int err; + + err =3D snd_gus_resume(iwcard->gus); + if (err < 0) + return err; + + snd_interwave_restore_regs(iwcard->gus); + snd_interwave_restore_memory(iwcard->gus); + iwcard->wss->resume(iwcard->wss); +#ifdef SNDRV_STB + if (iwcard->i2c_bus) { + err =3D snd_tea6330t_restore_mixer(iwcard->i2c_bus); + if (err < 0) + dev_warn(card->dev, + "failed to restore TEA6330T mixer state: %d\n", + err); + } +#endif + + return 0; +} + +static int snd_interwave_isa_suspend(struct device *pdev, unsigned int dev, + pm_message_t state) +{ + return snd_interwave_card_suspend(dev_get_drvdata(pdev)); +} + +static int snd_interwave_isa_resume(struct device *pdev, unsigned int dev) +{ + return snd_interwave_card_resume(dev_get_drvdata(pdev)); +} +#endif + static struct isa_driver snd_interwave_driver =3D { .match =3D snd_interwave_isa_match, .probe =3D snd_interwave_isa_probe, - /* FIXME: suspend,resume */ +#ifdef CONFIG_PM + .suspend =3D snd_interwave_isa_suspend, + .resume =3D snd_interwave_isa_resume, +#endif .driver =3D { .name =3D INTERWAVE_DRIVER }, @@ -871,12 +979,28 @@ static int snd_interwave_pnp_detect(struct pnp_card_l= ink *pcard, return 0; } =20 +#ifdef CONFIG_PM +static int snd_interwave_pnpc_suspend(struct pnp_card_link *pcard, + pm_message_t state) +{ + return snd_interwave_card_suspend(pnp_get_card_drvdata(pcard)); +} + +static int snd_interwave_pnpc_resume(struct pnp_card_link *pcard) +{ + return snd_interwave_card_resume(pnp_get_card_drvdata(pcard)); +} +#endif + static struct pnp_card_driver interwave_pnpc_driver =3D { .flags =3D PNP_DRIVER_RES_DISABLE, .name =3D INTERWAVE_PNP_DRIVER, .id_table =3D snd_interwave_pnpids, .probe =3D snd_interwave_pnp_detect, - /* FIXME: suspend,resume */ +#ifdef CONFIG_PM + .suspend =3D snd_interwave_pnpc_suspend, + .resume =3D snd_interwave_pnpc_resume, +#endif }; =20 #endif /* CONFIG_PNP */ --=20 2.53.0