From nobody Mon Jun 15 02:46:02 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 A895F3126DA for ; Tue, 7 Apr 2026 15:23: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=1775575386; cv=none; b=CSX1zkfRCoSc/xuGZ3b1wlYWI5Wz4CUBIHPWYGx1lfJPnw3tND4v5kTE9mgCMVJjCAkSc7KL6t8j6+0MC7Ex3pRZCX7nagHuRCaYCYQSyHtpC4/8vmfFnl78tcVBf71i78BmNkRPhptA3Uoc3lkyERfrShsQ76Tbjsl3lGK7Yq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575386; c=relaxed/simple; bh=dB7P+hW2P2i24SpsF7yvWCHcLNtwvsI1lS/8EmcxB48=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JtO1PzGYTXV40JNEgwdzKgM1UrGyVr8hk3qxpZsyYs9ZeCCSZKzMdM8C6lv3yFwq+G1zvUsUvUcqfMl55hZz0k1HA2DTijaBwX+1UKmB6s692htvYXVwVoTSyykuEaUIT3SrSTpEcqFuz9i46ysAxXD3y+HKo1JfvNpZ+46bYaI= 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=TiSnbAJ+; 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="TiSnbAJ+" Received: by mail-dl1-f48.google.com with SMTP id a92af1059eb24-1273349c56bso6564276c88.0 for ; Tue, 07 Apr 2026 08:23:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775575381; x=1776180181; 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=TiSnbAJ+1e1aMlSilysCHdFKhrPGYC019nkK/0aHi+CktkkfTuYyjHkTaichyQ4sQD 626MwnU3AV+z8GKT2OSUTy6CFsT/PmMWcaRQBjjWMilKypzckyWmcfoBeotewOnKgv1v zpqAslBEE9d7V0KwdjuTg6m9hSBdcWbJ0kDH6ufxXMbQtcDx1NepUMUX1FAq7nfkxGnz jElX2aDrWsGxCCzhB+Yx7AkpZlOMJKwjAM20nJV4kDDpG7Oq55B5+sKtL8Nmd/3hDUo2 wxlXIivxtid2Gl/MVjfzQnCI0vwENiXHs2b0MOfdbxvdPjPVC83f81nvd1svSE5DZ3NS YePA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775575381; x=1776180181; 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=UzxPTs5eR/eugiWT5ZXFoHDG4uMqwa6T3xm2Eq0EA8iI4lFXT+gZIz3p+NSR80Q9sF IoU4I6ACc5aWhvkRVrJz7EzVs7eaA3W6zm55rmUqCmX6DnhdO2tTjmKBq0XvzDKFBnUk 8BLjQ+QOi0WX7yFizMxGcjSLZQhoHfrhQDMU0E5onbd6lfKraidxHEhDUcZoYXyKt66j PJ9PWz6ofa8NQNRDMMRcfZBw4LVJ/zE2SILkomIl6sI+77/T9gl8IpVMHOys5FrRREhS hP1LjbsWyQDM6RnQ3qdH9p1868ra/j7qFfuAieOIXLmdDpaTqjt7+TVcAuA6YQnwXLA4 AbSg== X-Forwarded-Encrypted: i=1; AJvYcCXSXVGbiEnF7Y4sStKDXgmWx7OEBYNYUpmDIITdu7gTGL8/sBFD+hzP/N3acnSzEZNmeTYKAkzi7RApitg=@vger.kernel.org X-Gm-Message-State: AOJu0YxnEPsOVyU7ZEwfikoinvjgtFb0GezKckVqbvm25UJM/OGUFROr MF+p0IZ0rg//M1Ndvb0VzIe8SoK7VKDBbajcfAJ2/99Hd3l8pcLv8LbjREeKZg== X-Gm-Gg: AeBDiev9neJRsdKTnsN+VbDcBn2sutUstK6B2Lf2zIY/UfadCR8E6Qj4V1+0LPxwLIy sSWtxF21lv7gwfzISBjGePTOPfHXzXrnFHzF3st9jyF73OM+Jjju8mD76Yr9S/lE/jAai/sW7Vr Fa1jKtT2EazJ/lsPTv8R8OBulBYydoL+ccS4WwpVzVlQBRKt8vNXWhe7ztpx0tiX3Vffp53rrx0 aR4orlvVBdp431f6HgjFiDjUyVKYNBO9nE0IxBFbOLeTnlXgYrwMxvKYFxzT4bv8TfQQ0oYroZx NORByi0tGNjrJI1aWxzy/kYhnudZKEo1jhdgg9i7yhbtbw2ivOi2Ozw2lXIpQrWJ1mks/P5oug5 B+0WFSxEwg5oU2KyWBPKGXAskLMefIrJc0ga1pdsIaGPnf2NpHrvaESv/+hZVDv7V+AKZCoax1Z 5FruORlMY5YPgvVVb1SVpitJac1JojYtO2GoG8htjSiEHvWEV2eE+Spaxmaatgooe1TZXoVUKzc bsP X-Received: by 2002:a05:7022:4585:b0:128:d5bd:357f with SMTP id a92af1059eb24-12bfb7653e6mr8610585c88.30.1775575380694; Tue, 07 Apr 2026 08:23:00 -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 a92af1059eb24-12bed93f861sm20628473c88.0.2026.04.07.08.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 08:23:00 -0700 (PDT) From: =?utf-8?q?C=C3=A1ssio_Gabriel?= Date: Tue, 07 Apr 2026 12:22:49 -0300 Subject: [PATCH 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-v1-1-80da1151f59c@gmail.com> References: <20260407-alsa-interwave-pm-v1-0-80da1151f59c@gmail.com> In-Reply-To: <20260407-alsa-interwave-pm-v1-0-80da1151f59c@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/u2bG02pJDJlXFf2O3Z5VIeOpG7E8ys2P66/gzgOPppdp/JWbZpi/4 PSuA3ubOkpZGMS4GGTFFFlWJy2y3NP14Gp93AoPmDmsTCBDGLg4BWAib38wMkwNl+HtviV6Ulvv R8Pi/enaJb2vI3as+baxOYhtVuPMV/wM/wxqWzfn8HAt/rV3b77KwZ7E9f7fXs6uUi91v5SiJzl 7NQMA 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 Mon Jun 15 02:46:02 2026 Received: from mail-dl1-f52.google.com (mail-dl1-f52.google.com [74.125.82.52]) (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 AB4C139F168 for ; Tue, 7 Apr 2026 15:23:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575390; cv=none; b=Nptgwo7PuLgqissIUjJj6LVKKkAq6WYNTgPZX3Rq8wJKaL3NboJ4bt63aS3UToOw3Gn5lMyRvpmR8V8bdfc63oAEa3Ryl9W/4vzQwoFkVJb0VQsOhYwpbF8w9dRB4BTbLfjaUDJ/7R5NMiG5YYjXcgZ3HbUVp7LL29BOcPKzyec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575390; c=relaxed/simple; bh=dr9NNaPgzVLX/zcwEHihdZJ0bQ47V8p9Qe3DikgzCnU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lasxqIx4Um4XVZ04us9NlS8D0NH/AhET/pxsvO98VguZ7JZ5sZ3f9IbyZwwqpKpd425EoDVUIYjkoB90cQHu5yN/VDPoOVWvwKxjFwATf3mko8srgPBLbVMLKMu67Cf9RbN1aEe02aVsb77CXDGuPqvuIlch5jk8bun772lwzY8= 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=lbsZZaFb; arc=none smtp.client-ip=74.125.82.52 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="lbsZZaFb" Received: by mail-dl1-f52.google.com with SMTP id a92af1059eb24-1279eced0b9so6127092c88.0 for ; Tue, 07 Apr 2026 08:23:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775575384; x=1776180184; 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=lbsZZaFbSsWz/vDfsINdChIhanJ5/zoUlElXC78/ixQoSXLtUIvvKxsM3Xog9FN6PB FBEY7KQr5o01H1VUKjr63NnvFI76gzI09srxIG6Xnhxs3WqWW0S+2D9/cFabI920wUHr 418jEIKF2NmPDQxzF86X+28LlddukRDXQIqeApkwIvXwVoekbyuimnE+VlH+xkDX/xyd 5qJbHlvEtDGiAK+DooY+Ckila7ZqDua1v+jJjyzAcQDRTx55TlECx9hgFeT28AyxjSDf pSLJJqX8EAFap1RqhYviCQDm5KGgq/qzD9y4jtk0z6Dx6zwOPWUk+N6qSvEqKx4XBbUJ Nq7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775575384; x=1776180184; 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=RiEx1paISsOyCokLFp1LHH5hkoFawcNN5q8BgkSwSgu4WxxBBnIwefXBNvg4UXkMuI cNuKjDzaLaUbaXuhXYq+NwUzr6uJxnEXVi5T/EHNmfhXP2cp5XOg9qkxmUx8IQmXq+kc EEVoNc8l9AYTRYfqUn+ooJrApRKY949Kw1VibwXGCOhbEH9iEUUp6c0iH/HUuuVQ76z4 EIUokoUV3AJySDJqZB5DJEdKjlTPhFy5/CphbZT7nGRlOEIDRU3SKp5Jl+jnClanYUe/ g8am5Nmwe+pkh1nRTsfidV/Kt798VmNZGz9gOoCcEr/OaU9cDARobWNPiHDvfpoO+E2C Z85g== X-Forwarded-Encrypted: i=1; AJvYcCW/81aOs6DpRZGMCqZqqK4b4EwOBIh69/Gqsx0TfqufX7SSjp9nmYTpiGk2GrCexg+aDq+qvZnhaFBmFFA=@vger.kernel.org X-Gm-Message-State: AOJu0YzYL36cyb9yGDGXAxcr/A9JvbOkL4VxU5+LIRnCkAhn/ahKdaB0 JYI8F5KbySfsoqyqTXdPsaDTvT2EhQLFIGPWjzEeIc4/hFayjB+8k9bkVUXPyQ== X-Gm-Gg: AeBDiesocqph9x0NzrBxEx92P6ZxCwZA5dqB3TrJEZkYY2Ylz6ilLN8BDhYLhN6JSxs BGzX3dXqejSmONpFWCqdBaH5itomUYf7huE/JFdgE1k2DrIwQvqW/BpUoQztSazuqZGYrwq7otl qdVtgmA7U9vRemb3X1RrLP4DZoQdqJ8mApYvSGEaMtAuGc2rUZxi20wDp2K2bUCw/bSfv7+77rC 8iOPGZ304ZZOHIxggvezdPpLvSKMXTUp76sMqWLMkxdXv2bJZJ35Is+GSWK8VmSJ4U53wKzaShH pgjOOwa0ZUnJeY0L6EQaBd1+xvCKCQ+q/HHJ2P5xouSociGliljpC0cLLyOkEYrAFtW2g72K1kt ZkKZjkl4v/IkgHBvaRTEL9lmh7oE5ozNovwlTMu+K4LB+p8wDiGgamaivD6AYQ1n01WQugMzTkQ lUsfDFztnBs/LFbVwB3FlPFyca/A8yy+1YcIJ2mKl5yFEOsMer2AF9eN56uNqwZRYLj+lmiwHtf vkH X-Received: by 2002:a05:7022:49d:b0:12b:ed30:5a32 with SMTP id a92af1059eb24-12bfb6e7d5cmr7269868c88.5.1775575383667; Tue, 07 Apr 2026 08:23:03 -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 a92af1059eb24-12bed93f861sm20628473c88.0.2026.04.07.08.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 08:23:03 -0700 (PDT) From: =?utf-8?q?C=C3=A1ssio_Gabriel?= Date: Tue, 07 Apr 2026 12:22:50 -0300 Subject: [PATCH 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-v1-2-80da1151f59c@gmail.com> References: <20260407-alsa-interwave-pm-v1-0-80da1151f59c@gmail.com> In-Reply-To: <20260407-alsa-interwave-pm-v1-0-80da1151f59c@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/u2bG02pJDJlXFf36J8u2rbDnmMpx6ODGhXXrb9jfizqdYh12f/sx7 d9RESYqHaUsDGJcDLJiiiyrkxZZ7ul6cLU+boUHzBxWJpAhDFycAjCRF78Y/meXttzt+LNdKOEo S1zD7tf3XjJbumgVrj0Rlv5tp3r4tGeMDN9Ugxr+1Kzd77/8dda5R8sMWRYyF5g/eetxcFtFp8Q Wd1YA 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 Mon Jun 15 02:46:02 2026 Received: from mail-dl1-f47.google.com (mail-dl1-f47.google.com [74.125.82.47]) (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 825E53988F2 for ; Tue, 7 Apr 2026 15:23:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575391; cv=none; b=DjaCYOxywORToN37sKPFcEeRai/81/kkeJzHbemiodNOuD3fm7YMd4C6oyauHfZ/mR4cbeD8kOWEM03kBG5H+VCP7srdOkHa7uM7XtDpRvWLhgDnOfxQJfrT/myZk9Xkr84IQffa3/6iIbbVBJzvcceK4SKaLYwU46XdI+v5o0Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575391; c=relaxed/simple; bh=4Y9CqXMn8U69M84oxZ10Kqm4IkJzKs8xnoSjmQa3AR0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PRZEUBHMCOa26vSj/CzW4KkAb+50x55DnKkvxuDh1TpwNbIutq4saJ/2OfLnM5xvZLLlZMKQLc/LNLpKJt4df7hi0S1DHzLgSzNmKiViLBrtDMe4/4qsZJua/xbfdSkyL3lFtJzOy5rglSGs6jEIe48cHUZmvJ+mTpijN9ZLNDw= 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=jJWdggIj; arc=none smtp.client-ip=74.125.82.47 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="jJWdggIj" Received: by mail-dl1-f47.google.com with SMTP id a92af1059eb24-1274204434bso4753252c88.1 for ; Tue, 07 Apr 2026 08:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775575387; x=1776180187; 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=jJWdggIjaludTOEPtMfsJMa9mh8o6nPz3mtRXoNPso7UGd4Wpo5czXAh3BDdM0kM9s kRWZuzzJcwjWZRmr/c3HJ6PtbRJp17yDwjaY6cgUq6TYDN1x/kN1AnAglnJ4874myYd1 KfulnqnYmlJ9Flm183cWx5V6EmDoJM2/Vf3woxuNX8PaxC7aAw3jKYfCEOjepSQaHCLk lQ/vLSzRYDFHExpnSYUaFJFwLYTVHgXYRlDvk0lb8baAm4bC02QxDgysKwRNrgo2BiV9 IkmRWZMAY9kUP30NeYqrbXFxfSD2zAUY+1R9nln3GgNzyMK2jdOc5427BQOO4DYEJQtT +/wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775575387; x=1776180187; 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=grsc5c93M6ZPhg7KsUD6BjxtHVxfev+X8wg1urqgi+loYbaiIdZxIG6H/P97FCsFXV iHw8LZncV5T0VlHLPQ/Cxdk0nciBVNrsQlApj4MBbpFbOBkiw/Qal45c+M39/9N0l0Cs 1rCKcmd6KP5UAB5ghRDDX50/VSvcKMxiDV7fdm6ftcj0JBRnrTL84lv/GNgSMYY0B8V+ 4U0D9rXM8xs/Ua1dQqRBfsXsi26XMEcoXecY9unE8S9qLtUJWbQuOcm6FBUgX8hfDaxM c0cu+QAPs206XwCz7FYLTc/0jmLpxCHzX9SWD0rDwWlquz8C4VDnCPV+34467Cia9Q63 UjCg== X-Forwarded-Encrypted: i=1; AJvYcCUHbNpQ2VsxsfqPoI8thyp5YWAKiOVMfDaCKF5tGELfKBXwry3T11BnklW10QDO7X2f+L6G7pStORtUo3s=@vger.kernel.org X-Gm-Message-State: AOJu0YzzGCYwxx3t+4TcQHdDQIAYW1pwX9ixIoDrPW5VIxyT1HQSG5G4 5aWHs7uMdAef3PIy24gtZnnECdeuScGurPh1o5vVzm20LRhTQpbYJUGH7sdt+A== X-Gm-Gg: AeBDieurexxPoP70qfwK40MMnDbSzFFfBc6yVVfFwmOVHIqgu/+PWw5wtWadFnGBXU6 14wYzaOdNgTbPY0Ub50JNqXFwtR3/h4Y/wKxa+C1/l8zmeUCZ59zAIRCf+ehK03nOg/TAzFVaWh b7aXw/tNS4B159qDqKyR/O5YaZTOkX9tdhu8PBMR6/EAKasQK8wrezP59Aqkld+L2W3MdhbI4OF ittLxg/HqJtTaOxNy91rE1+BIuY9VUw7i1+xMy7Y57WMUge7Z1koXxG3kQAHKXpQb/Rzhzt0wEl L71zjrP5XlkRGmHTseAuhOyPWpKLqBW2z8UovAGCkbp3e6jYZJ89U2zGs7++oP1X1j/ADNIY/X8 2ueaWgunEMnRLNSolP5bAufLR2smYzhm9W8fC3pUPbFYzG1SIurY+NJmNAZPS8CuGR/dZfGUDgL 4vXufjFVhAI90wUMaegIDu/gqH+ep1a4yLF88I6ZYhxBRTS1TK8vqYhdBQTweBnUXS/0s3eDJ6B iHxkBUCu0+M5bk= X-Received: by 2002:a05:7022:4591:b0:12a:6abf:ab1c with SMTP id a92af1059eb24-12bfaf4e6b7mr6948722c88.11.1775575386599; Tue, 07 Apr 2026 08:23:06 -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 a92af1059eb24-12bed93f861sm20628473c88.0.2026.04.07.08.23.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 08:23:06 -0700 (PDT) From: =?utf-8?q?C=C3=A1ssio_Gabriel?= Date: Tue, 07 Apr 2026 12:22:51 -0300 Subject: [PATCH 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-v1-3-80da1151f59c@gmail.com> References: <20260407-alsa-interwave-pm-v1-0-80da1151f59c@gmail.com> In-Reply-To: <20260407-alsa-interwave-pm-v1-0-80da1151f59c@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/u2bG02pJDJlXFf2OJCurl09UKtSaov2Ec4bgjail/1Im8h6YNNkzf fc1IeGAjlIWBjEuBlkxRZbVSYss93Q9uFoft8IDZg4rE8gQBi5OAZjI3XkMf6UPyr/q3P9iSuor 01vPnQOKOvKNVOxuLjRfvUFufb1GVzrD/zSDd4aK3rtOpz+5WNrkLtkvsbnseqzL0WB21fZFz67 EMwEA 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