From nobody Sat Apr 11 00:44:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF30DC32771 for ; Wed, 17 Aug 2022 13:11:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236899AbiHQNLU (ORCPT ); Wed, 17 Aug 2022 09:11:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239957AbiHQNLM (ORCPT ); Wed, 17 Aug 2022 09:11:12 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14EE8E5D for ; Wed, 17 Aug 2022 06:11:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660741871; x=1692277871; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PQrMNQ/yvxjBTfA2wtMDXqk4o7bSOW6yITOwfe9v8m4=; b=WTtzD+Ayu5aXg03f86ZkjwEN/neVCIrmvUUO68IrsvJyE9WzrummZ8GX Ai7y6dr/kIbqM6DFk7vu0M6sxV0CG9G94pJDGAMgdIRDcRIyr/18CyBjS 8jXT5meB1u596ywVLhD6XQPZMJz+uBExNdw+X0g0Dn/xfNCdhUykILrbA vQklxpBhKY6SsEJ/Cq0frrvGkE1Webbj37QD0rt54EZaZyxR8c8WsNjK1 yxvHmS5HGE84TmUut+UL1KyvzpsvdAGUCDWlUz4Ee/xi54E5GNTaO199x wOUJQPaZHTnnSqDJh5eVRy+BWyZdacKVxYyJdXfQLXr21Vns3YeDtNMGY Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10442"; a="378779131" X-IronPort-AV: E=Sophos;i="5.93,243,1654585200"; d="scan'208";a="378779131" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2022 06:11:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,243,1654585200"; d="scan'208";a="667609948" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga008.fm.intel.com with ESMTP; 17 Aug 2022 06:11:09 -0700 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= To: Takashi Iwai , alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org, Cezary Rojewski , Pierre-Louis Bossart , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Subject: [PATCH 1/4] ALSA: hda: Move stream-register polling macros Date: Wed, 17 Aug 2022 15:11:34 +0200 Message-Id: <20220817131137.3978523-2-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220817131137.3978523-1-amadeuszx.slawinski@linux.intel.com> References: <20220817131137.3978523-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Polling stream registers doesn't really have anything to do with extended HDA registers, so move it to basic HDA header. This will allow for use in HDA framework. Signed-off-by: Amadeusz S=C5=82awi=C5=84ski Reviewed-by: Cezary Rojewski --- include/sound/hdaudio.h | 6 ++++++ include/sound/hdaudio_ext.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 797bf67a164d..a46708b2d8ea 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -589,6 +589,12 @@ int snd_hdac_get_stream_stripe_ctl(struct hdac_bus *bu= s, snd_hdac_reg_readw((dev)->bus, (dev)->sd_addr + AZX_REG_ ## reg) #define snd_hdac_stream_readb(dev, reg) \ snd_hdac_reg_readb((dev)->bus, (dev)->sd_addr + AZX_REG_ ## reg) +#define snd_hdac_stream_readb_poll(dev, reg, val, cond, delay_us, timeout_= us) \ + readb_poll_timeout((dev)->sd_addr + AZX_REG_ ## reg, val, cond, \ + delay_us, timeout_us) +#define snd_hdac_stream_readl_poll(dev, reg, val, cond, delay_us, timeout_= us) \ + readl_poll_timeout((dev)->sd_addr + AZX_REG_ ## reg, val, cond, \ + delay_us, timeout_us) =20 /* update a register, pass without AZX_REG_ prefix */ #define snd_hdac_stream_updatel(dev, reg, mask, val) \ diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h index d26234f9ee46..03634ea198d0 100644 --- a/include/sound/hdaudio_ext.h +++ b/include/sound/hdaudio_ext.h @@ -188,12 +188,6 @@ void snd_hdac_ext_bus_link_power(struct hdac_device *c= odec, bool enable); #define snd_hdac_adsp_readq_poll(chip, reg, val, cond, delay_us, timeout_u= s) \ readq_poll_timeout((chip)->dsp_ba + (reg), val, cond, \ delay_us, timeout_us) -#define snd_hdac_stream_readb_poll(strm, reg, val, cond, delay_us, timeout= _us) \ - readb_poll_timeout((strm)->sd_addr + AZX_REG_ ## reg, val, cond, \ - delay_us, timeout_us) -#define snd_hdac_stream_readl_poll(strm, reg, val, cond, delay_us, timeout= _us) \ - readl_poll_timeout((strm)->sd_addr + AZX_REG_ ## reg, val, cond, \ - delay_us, timeout_us) =20 struct hdac_ext_device; =20 --=20 2.25.1 From nobody Sat Apr 11 00:44:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7677BC25B08 for ; Wed, 17 Aug 2022 13:11:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239621AbiHQNL1 (ORCPT ); Wed, 17 Aug 2022 09:11:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239969AbiHQNLO (ORCPT ); Wed, 17 Aug 2022 09:11:14 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90B74232 for ; Wed, 17 Aug 2022 06:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660741872; x=1692277872; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WeXg1qGK5oHjX2LzaydOvVCoa4HLF6ZfQTJlOzwHso0=; b=LLgmfgzXTcBcJx4bj3cRui32O2UX0kwAjpnnMFf/2fo0ew8TlUSCmAyR FTi8249vty0MakIVhnShGJXW3/6cDWOBmfKRw9oOjU2gil/vKs+aBgMbY hXdG8GjHAjkxJgG0XpxA2HCydMT3xhN7qGFeS14uiz5kqppfXqXtfKRG+ aazM7cVG0SoVWBx1HgglN1lkTXyrTsgTTL0uLb433GAbkr4xOBiDnN4Y0 ekO9PioC3z7bXVwBrkzC+6HYF8ajd7BiKD5Gz3x1EKV/4yBMOf7IhSHFu HII0adW7LiP9tuqK55icJuHr0uWvMkpnBMMlBzxS1fxrRZf5cGbaPuQ9H Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10442"; a="378779139" X-IronPort-AV: E=Sophos;i="5.93,243,1654585200"; d="scan'208";a="378779139" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2022 06:11:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,243,1654585200"; d="scan'208";a="667609957" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga008.fm.intel.com with ESMTP; 17 Aug 2022 06:11:11 -0700 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= To: Takashi Iwai , alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org, Cezary Rojewski , Pierre-Louis Bossart , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Subject: [PATCH 2/4] ALSA: hda: Rework snd_hdac_stream_reset() to use macros Date: Wed, 17 Aug 2022 15:11:35 +0200 Message-Id: <20220817131137.3978523-3-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220817131137.3978523-1-amadeuszx.slawinski@linux.intel.com> References: <20220817131137.3978523-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can use existing macros to poll and update register values instead of open coding the functionality. Signed-off-by: Amadeusz S=C5=82awi=C5=84ski Reviewed-by: Cezary Rojewski --- sound/hda/hdac_stream.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c index f3582012d22f..ce6a2f270445 100644 --- a/sound/hda/hdac_stream.c +++ b/sound/hda/hdac_stream.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "trace.h" =20 @@ -165,7 +166,6 @@ EXPORT_SYMBOL_GPL(snd_hdac_stop_streams_and_chip); void snd_hdac_stream_reset(struct hdac_stream *azx_dev) { unsigned char val; - int timeout; int dma_run_state; =20 snd_hdac_stream_clear(azx_dev); @@ -173,30 +173,17 @@ void snd_hdac_stream_reset(struct hdac_stream *azx_de= v) dma_run_state =3D snd_hdac_stream_readb(azx_dev, SD_CTL) & SD_CTL_DMA_STA= RT; =20 snd_hdac_stream_updateb(azx_dev, SD_CTL, 0, SD_CTL_STREAM_RESET); - udelay(3); - timeout =3D 300; - do { - val =3D snd_hdac_stream_readb(azx_dev, SD_CTL) & - SD_CTL_STREAM_RESET; - if (val) - break; - } while (--timeout); + + /* wait for hardware to report that the stream entered reset */ + snd_hdac_stream_readb_poll(azx_dev, SD_CTL, val, (val & SD_CTL_STREAM_RES= ET), 3, 300); =20 if (azx_dev->bus->dma_stop_delay && dma_run_state) udelay(azx_dev->bus->dma_stop_delay); =20 - val &=3D ~SD_CTL_STREAM_RESET; - snd_hdac_stream_writeb(azx_dev, SD_CTL, val); - udelay(3); + snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_CTL_STREAM_RESET, 0); =20 - timeout =3D 300; - /* waiting for hardware to report that the stream is out of reset */ - do { - val =3D snd_hdac_stream_readb(azx_dev, SD_CTL) & - SD_CTL_STREAM_RESET; - if (!val) - break; - } while (--timeout); + /* wait for hardware to report that the stream is out of reset */ + snd_hdac_stream_readb_poll(azx_dev, SD_CTL, val, !(val & SD_CTL_STREAM_RE= SET), 3, 300); =20 /* reset first position - may not be synced with hw at this time */ if (azx_dev->posbuf) --=20 2.25.1 From nobody Sat Apr 11 00:44:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE28BC25B08 for ; Wed, 17 Aug 2022 13:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239703AbiHQNLe (ORCPT ); Wed, 17 Aug 2022 09:11:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239977AbiHQNLQ (ORCPT ); Wed, 17 Aug 2022 09:11:16 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1328ADF5 for ; Wed, 17 Aug 2022 06:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660741874; x=1692277874; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qNvx66hWZqGva6cBOQUF79aywA0lLqhY5wC4GeSrizQ=; b=N6AWxz8lyVWf1/qYpZn9Xq0IZnHTVr/K1x80pdq7GArrXeWxH+ppPZd6 Klx+SWF0q8wr/BOMt8WG0jt68gNimko4ynve6ZMd9OQkJnTTR6tRO9esd k+rqhL9ic69sxENnrx5FT8x7WqFnVrPIy0vvPs/mQ+fuyyyhz5YBVZPwM VjsxiQTYuYy7WKyIppenj6x8mjjQ5f3IVA7UNb/jbTYsj5P4GYWhIst2r WJPc2s5edeqJr6S3wBDgHH1n6ZZefek2KAEJD3tdotelXOU4jiTfBj/5I srKiK7BccifD41RJnR7jRBz6Vhj3BHEveCclZZndAmsX47r3cpAs9IKGL Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10442"; a="378779143" X-IronPort-AV: E=Sophos;i="5.93,243,1654585200"; d="scan'208";a="378779143" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2022 06:11:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,243,1654585200"; d="scan'208";a="667609971" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga008.fm.intel.com with ESMTP; 17 Aug 2022 06:11:12 -0700 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= To: Takashi Iwai , alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org, Cezary Rojewski , Pierre-Louis Bossart , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Subject: [PATCH 3/4] ALSA: hda: Remove unused MAX_PIN_CONFIGS constant Date: Wed, 17 Aug 2022 15:11:36 +0200 Message-Id: <20220817131137.3978523-4-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220817131137.3978523-1-amadeuszx.slawinski@linux.intel.com> References: <20220817131137.3978523-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since it was introduced around v2.6.30 it was never used. Also HDA specification does not mention any limitation on number of PIN configurations. Signed-off-by: Amadeusz S=C5=82awi=C5=84ski Reviewed-by: Cezary Rojewski --- sound/pci/hda/hda_sysfs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c index bf951c10ae61..69ebc37a4d6f 100644 --- a/sound/pci/hda/hda_sysfs.c +++ b/sound/pci/hda/hda_sysfs.c @@ -375,8 +375,6 @@ static ssize_t user_pin_configs_show(struct device *dev, return pin_configs_show(codec, &codec->user_pins, buf); } =20 -#define MAX_PIN_CONFIGS 32 - static int parse_user_pin_configs(struct hda_codec *codec, const char *buf) { int nid, cfg, err; --=20 2.25.1 From nobody Sat Apr 11 00:44:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C182CC25B08 for ; Wed, 17 Aug 2022 13:11:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239716AbiHQNLj (ORCPT ); Wed, 17 Aug 2022 09:11:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239979AbiHQNLQ (ORCPT ); Wed, 17 Aug 2022 09:11:16 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC847232 for ; Wed, 17 Aug 2022 06:11:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660741875; x=1692277875; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jN4kHoRUJSHbesemixiddrBAK3WzhEvbf8eObKfKwbU=; b=f+bf6pEnc1+Tv1CibrBMBqJm7YCvYQuPxq0QuxI7qkfw5gbBN0lG5022 G9/Fct9NXxrF4wA/jDysJv4ENeYV3bAtv2/bCSV3suUg1D0MI8ikFRpvw 3ws1JisQ683ZazMEH50Nkk+7a1QBpvP77LuFMPpd25yxXzG4KiqFfUPvN aFSSnhuRTP3T5Fba1UD4t62wfVXKuvIevpLA4djlg/uJC3OhVnFcu5XS0 MDDDZ/gZE4C3113MpVdafgFwxITvKwyxvrGb+elkCCS1p9otshvmGN5pz FgkQ2Z1LnVtvK7BrdJzaJMhlUiRbPNIz+wXRabe2G93cLwASKWHgIh5vx A==; X-IronPort-AV: E=McAfee;i="6500,9779,10442"; a="378779146" X-IronPort-AV: E=Sophos;i="5.93,243,1654585200"; d="scan'208";a="378779146" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2022 06:11:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,243,1654585200"; d="scan'208";a="667609981" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga008.fm.intel.com with ESMTP; 17 Aug 2022 06:11:14 -0700 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= To: Takashi Iwai , alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org, Cezary Rojewski , Pierre-Louis Bossart , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Subject: [PATCH 4/4] ALSA: hda: Remove unused defines Date: Wed, 17 Aug 2022 15:11:37 +0200 Message-Id: <20220817131137.3978523-5-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220817131137.3978523-1-amadeuszx.slawinski@linux.intel.com> References: <20220817131137.3978523-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no need to keep unused defines in file. Signed-off-by: Amadeusz S=C5=82awi=C5=84ski Reviewed-by: Cezary Rojewski --- sound/pci/hda/hda_intel.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index a77165bd92a9..7720978dc132 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -86,9 +86,6 @@ enum { #define INTEL_SCH_HDA_DEVC 0x78 #define INTEL_SCH_HDA_DEVC_NOSNOOP (0x1<<11) =20 -/* Define VIA HD Audio Device ID*/ -#define VIA_HDAC_DEVICE_ID 0x3288 - /* max number of SDs */ /* ICH, ATI and VIA have 4 playback and 4 capture */ #define ICH6_NUM_CAPTURE 4 @@ -102,10 +99,6 @@ enum { #define ATIHDMI_NUM_CAPTURE 0 #define ATIHDMI_NUM_PLAYBACK 8 =20 -/* TERA has 4 playback and 3 capture */ -#define TERA_NUM_CAPTURE 3 -#define TERA_NUM_PLAYBACK 4 - =20 static int index[SNDRV_CARDS] =3D SNDRV_DEFAULT_IDX; static char *id[SNDRV_CARDS] =3D SNDRV_DEFAULT_STR; --=20 2.25.1