From patchwork Mon Oct 10 12:19:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 613787 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 28556C433F5 for ; Mon, 10 Oct 2022 12:05:10 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 45EFE296A; Mon, 10 Oct 2022 14:04:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 45EFE296A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403508; bh=4YdFMjhM1DtFAFfOtuD42QSIi2KGcULvygjiUYi2suk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=aey1a5srpH/ZyFLjgyiFWETjs1T4dbPM6Dlto7byef9UJQ+zcwUgNUBAfRiawf3Xg cqbyDvFXCtvjvCOAVGPai4iFgK3G/S/cHXuKce+uJFwfKG5tuIllcjufJ3ffES61k0 l//C1YnJHcqKYyO8y67o2Fpln0FO6fD/NPatPn+g= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 681BFF804FF; Mon, 10 Oct 2022 14:03:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E6AE5F804FF; Mon, 10 Oct 2022 14:03:57 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6261EF800B8 for ; Mon, 10 Oct 2022 14:03:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6261EF800B8 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="N5s4AAt8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403432; x=1696939432; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4YdFMjhM1DtFAFfOtuD42QSIi2KGcULvygjiUYi2suk=; b=N5s4AAt8cems6+DLyI9piHmT/C7P39AsAmrZRTqhpgyo/Eo1Wzgi/sJO gm/6dRhHLaSpOlkTx0Cg6iAUoH3AP6zn8wFpDWyouBz84RXg+a6MLaJLC 2nokix/gq9MVEuHtaXq96t3zduEzc/C3kq9tUr+lwCde+VQebgdTtBQH/ leZWHWRtJJnJRu6Ovh+VGi7ni61BrnaWgi5VCH/dnBRE6pHgLqYz/48Yc Z/oURYYhvGVmUFhTH0JWMFP98cs2c2QCl2AmfwajrhoKKJT4cNRJ4Ok6y 8dQnohfI9PqCibXNQexBQ2Nmdzl3kvmK0++Zk2l9so8BVutUwK2Ew0+Wj w==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346065" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346065" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:03:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078860" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078860" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:03:48 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 01/15] ASoC: Intel: avs: Fix DMA mask assignment Date: Mon, 10 Oct 2022 14:19:41 +0200 Message-Id: <20221010121955.718168-2-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Spelling error leads to incorrect behavior when setting up DMA mask. Fixes: a5bbbde2b81e ("ASoC: Intel: avs: Use helper function to set up DMA") Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index c50c20fd681a..58db13374166 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -440,7 +440,7 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) if (bus->mlcap) snd_hdac_ext_bus_get_ml_capabilities(bus); - if (!dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64))) + if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64))) dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); dma_set_max_seg_size(dev, UINT_MAX); From patchwork Mon Oct 10 12:19:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 614238 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F33B7C433FE for ; Mon, 10 Oct 2022 12:05:36 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id F19C12964; Mon, 10 Oct 2022 14:04:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F19C12964 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403535; bh=WITP0r5AgZxlVo1fQXrFXmw6o2iVJQ0gaMwaR+xtqFY=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=U3yYpWp357+yqDTBGyQhkeh4DV9b8YXHvWuiKbY9DB63skOi7j/40gu0R6bfCEDir XlDGGGLbq6qJSLsFDE/9SwDxuqmL0iohyKBKBxH/yGmyx7Ha3N/x8eEpRRsrgjPM2L k3Wt7W+OH7Vzby0VkeV2NoJFbvSA0F3hx3+Z/hTk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E44F4F8053C; Mon, 10 Oct 2022 14:04:00 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7E5A2F80155; Mon, 10 Oct 2022 14:03:59 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0A8ECF80155 for ; Mon, 10 Oct 2022 14:03:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0A8ECF80155 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ARhGHXK0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403434; x=1696939434; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WITP0r5AgZxlVo1fQXrFXmw6o2iVJQ0gaMwaR+xtqFY=; b=ARhGHXK0DwjZ0uo9GcNj+khbR8A0PHuRahtvKsJxxO/MPeMc0fYULWZR 1sE3YtRsI8+LJ0LWktmlLRkyH4MJv+3f+soX8Evu00v5x0WO/0x7VVC+g siorGqQg0t6tFCk8V/QBu7Q6sVDsTkSQbLcsdAZpRKlspZyVOKEjvQE2X boUOXbWkNbFt+264a6XyTiIB2U0ZCJmI+WiEMZhx36AXEJdxPDgph9quC O7vyggWWSvQgSXaOGAHtRaTt82PYmTa/lfGUURbubEIDOFDHX3l+RACRK mGDLB0haMd1ZXcIBO4/P5kUalXQSM+h/2NubpCam7jXIXYWUMyFYHVdfL g==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346067" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346067" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:03:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078870" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078870" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:03:50 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 02/15] ASoC: Intel: avs: Fix potential RX buffer overflow Date: Mon, 10 Oct 2022 14:19:42 +0200 Message-Id: <20221010121955.718168-3-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , CoolStar , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" If an event caused firmware to return invalid RX size for LARGE_CONFIG_GET, memcpy_fromio() could end up copying too many bytes. Fix by utilizing min_t(). Reported-by: CoolStar Fixes: f14a1c5a9f83 ("ASoC: Intel: avs: Add module management requests") Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/ipc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/ipc.c b/sound/soc/intel/avs/ipc.c index 020d85c7520d..77da206f7dbb 100644 --- a/sound/soc/intel/avs/ipc.c +++ b/sound/soc/intel/avs/ipc.c @@ -192,7 +192,8 @@ static void avs_dsp_receive_rx(struct avs_dev *adev, u64 header) /* update size in case of LARGE_CONFIG_GET */ if (msg.msg_target == AVS_MOD_MSG && msg.global_msg_type == AVS_MOD_LARGE_CONFIG_GET) - ipc->rx.size = msg.ext.large_config.data_off_size; + ipc->rx.size = min_t(u32, AVS_MAILBOX_SIZE, + msg.ext.large_config.data_off_size); memcpy_fromio(ipc->rx.data, avs_uplink_addr(adev), ipc->rx.size); trace_avs_msg_payload(ipc->rx.data, ipc->rx.size); From patchwork Mon Oct 10 12:19:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 614237 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F13B6C433F5 for ; Mon, 10 Oct 2022 12:05:57 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1A80B2966; Mon, 10 Oct 2022 14:05:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1A80B2966 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403556; bh=Y+C0K3rMvAX7Fkbz9tCikyNo2LA84ck7uHuzCF98WSM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=d1bNNTPZ7nl5YnWqt/bg0Gq+TbHCPmhVZa4pVcEKCFssQ2bwPqi0vjlsO/zFEgUz2 wWuVlf2uz81L3qBZiB+YRfYihYFdGeUXDamfPb4hXRPE419zYoQ/pE2F2kumb4zTTf RwF52X0j1L13EqM+5xEkKyx8tPCP22A6SeW88b/s= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 858F0F8055A; Mon, 10 Oct 2022 14:04:04 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CE360F804AE; Mon, 10 Oct 2022 14:04:02 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9D058F804AE for ; Mon, 10 Oct 2022 14:03:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9D058F804AE Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ihxni4XZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403435; x=1696939435; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y+C0K3rMvAX7Fkbz9tCikyNo2LA84ck7uHuzCF98WSM=; b=ihxni4XZGMS6Ex61RV2PpKp0mmlNzXYvBdc34K3pFasIxHdodqWoI0Qm Foy8beP2VFjhhvna4rdidij/VmteJF8lVgSm6MpiVKVHkHN8zagvVSlKZ 2uTG9Nt/dBYwp7sTBsMBzekpA6IJf2i3OWODckQO5jTWBF50Mp8+qIrJu JOPJQlnMapPEcSDyjl8nJvYX4f7B1pydJfFljQd4mtdPbEHLmOlII1NWG B0g/l/4nIllKlC9XJ6PUrGliWI7e7tazGxn8dCKXxRLeX4lI1YWBY3her aTkNU7vJfDHB1AGAqljCNsS7byp3SS/PQq9v58kbWkXHUJrNn46Y0hu0J A==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346072" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346072" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:03:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078883" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078883" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:03:52 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 03/15] ASoC: codecs: rt298: Add quirk for KBL-R RVP platform Date: Mon, 10 Oct 2022 14:19:43 +0200 Message-Id: <20221010121955.718168-4-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Amadeusz Sławiński KBL-R RVP platforms also use combojack, so we need to enable that configuration for them. Signed-off-by: Amadeusz Sławiński Signed-off-by: Cezary Rojewski --- sound/soc/codecs/rt298.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index b0b53d4f07df..5f36064ed6e6 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1166,6 +1166,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, + { + .ident = "Intel Kabylake R RVP", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") + } + }, { } }; From patchwork Mon Oct 10 12:19:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 613785 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 08EC5C433F5 for ; Mon, 10 Oct 2022 12:06:15 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0AC672976; Mon, 10 Oct 2022 14:05:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0AC672976 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403573; bh=VQ+9I3jnad77LvGmc5hMgvLk5wcu1XLkdVRW4scTKfA=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=qcPOCKK/P0GZ4x7SZ9aa9XQASPGqMStU81ZXmfOWR38Tfa0XTnSVXAd6KZ9AkNYyA Rob2OBNniBOgACX9M34AZ40vJkWKHcD18zzNmdH1iIrEEENAZQDzNSFJozPUoklXo/ joC8mtFzDiwmtp8SRBCJ1Rh8Tvgblq2X8J18ZC4A= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 0E30BF80564; Mon, 10 Oct 2022 14:04:07 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CF429F80564; Mon, 10 Oct 2022 14:04:04 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3C68FF801D5 for ; Mon, 10 Oct 2022 14:03:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3C68FF801D5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="d2yhBty7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403439; x=1696939439; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VQ+9I3jnad77LvGmc5hMgvLk5wcu1XLkdVRW4scTKfA=; b=d2yhBty7jgqE3GwBsgOhyfpT7Pd72UemqFRKFinaqvuRFTVtNK2lBeu6 7+TCHJjv/+4QI07Pkq1prwLErlJOIcexjsyhU8UIhEYfOpIIwVK/FLp91 arrW35LSSx3KC7ImvYqvIayPrL0ilAQs8G0kGosxM0K0GzxMW2V7RoE8B Uj1k2rrvWUuIGg+QJt+9fUDe8yn91uVsWnt2lWNhh3CcTkrDL87Jnihi8 KEfYg+MIrisiXm4vYEIOv/OVyXSyZHgD1o1v3bjoQfyEZ5o2tfmu2tXd5 oPfJ5yx8RtfT3lcbunzA3jfyFYmrei2raKDFiFXcYbez4Ookvv3PEtjKW g==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346077" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346077" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:03:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078891" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078891" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:03:54 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 04/15] ASoC: Intel: avs: Add quirk for KBL-R RVP platform Date: Mon, 10 Oct 2022 14:19:44 +0200 Message-Id: <20221010121955.718168-5-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Amadeusz Sławiński KBL-R RVPs contain built-in rt298 codec which requires different PLL clock and .dai_fmt configuration than seen on other boards. Signed-off-by: Amadeusz Sławiński Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/boards/rt298.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index b28d36872dcb..58c9d9edecf0 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -6,6 +6,7 @@ // Amadeusz Slawinski // +#include #include #include #include @@ -14,6 +15,16 @@ #include #include "../../../codecs/rt298.h" +static const struct dmi_system_id kblr_dmi_table[] = { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_BOARD_NAME, "Kabylake R DDR4 RVP"), + }, + }, + {} +}; + static const struct snd_kcontrol_new card_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone Jack"), SOC_DAPM_PIN_SWITCH("Mic Jack"), @@ -96,9 +107,15 @@ avs_rt298_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_param { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + unsigned int clk_freq; int ret; - ret = snd_soc_dai_set_sysclk(codec_dai, RT298_SCLK_S_PLL, 19200000, SND_SOC_CLOCK_IN); + if (dmi_first_match(kblr_dmi_table)) + clk_freq = 24000000; + else + clk_freq = 19200000; + + ret = snd_soc_dai_set_sysclk(codec_dai, RT298_SCLK_S_PLL, clk_freq, SND_SOC_CLOCK_IN); if (ret < 0) dev_err(rtd->dev, "Set codec sysclk failed: %d\n", ret); @@ -139,7 +156,10 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->platforms = platform; dl->num_platforms = 1; dl->id = 0; - dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; + if (dmi_first_match(kblr_dmi_table)) + dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; + else + dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; dl->init = avs_rt298_codec_init; dl->be_hw_params_fixup = avs_rt298_be_fixup; dl->ops = &avs_rt298_ops; From patchwork Mon Oct 10 12:19:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 613786 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A8514C433FE for ; Mon, 10 Oct 2022 12:05:43 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9D70F297F; Mon, 10 Oct 2022 14:04:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9D70F297F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403541; bh=oy7fyKyoRPLZLsmhmobDVfYUc2SCjHIvJ0wTkN7LYcY=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ahJleExo3kUnvdjM56IQqktUcOhkJZhDHcuDxUU3zQdhVYFJgw0n1czfMN+TfWHJu mPD4dLHwlb8/DK5I6KEUXrQZIhsl3fkGe4ZadMBLBJgkE8XabQfQRRAIUiSY3fzw8a of9Iom13Q4k7xLh0ps+30jAb6XFLQPLGaMRhME3M= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1E74FF80553; Mon, 10 Oct 2022 14:04:02 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 95938F80549; Mon, 10 Oct 2022 14:04:01 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 90F3FF800B8 for ; Mon, 10 Oct 2022 14:03:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 90F3FF800B8 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="djn//NCf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403439; x=1696939439; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oy7fyKyoRPLZLsmhmobDVfYUc2SCjHIvJ0wTkN7LYcY=; b=djn//NCfxckNolDzwjPtBJtigD26RKhqU6pWduIwYSahF7WGrurSWKAa wUF00n2E4EyJBSiPiaUu5NGcyHddIpZZ0vWpGPlfPWZ+oOGMD6F5D3sEa FHSWcAniYiZB82wknO+Rj1rgaNb5GaXScQW8SQSpcWYSy82tNyuNDyogG +/AJA0zi++y28aZPFnRKV3Xqtdam7DGHXccbmohYdFFLwPP7fh074089c 99E1tiBOOI1EgOvX8rrnDGi76f1yiIa6Ijht41Mie25HPh5J//Sb+s/0A 57tifhIuXjmbJQhlHTJ3hOHsdF/8GZmK2wRayogyub7Ihlg8K5xBO96iw g==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346082" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346082" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:03:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078904" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078904" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:03:56 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 05/15] ASoC: Intel: avs: Support AML with rt286 configuration Date: Mon, 10 Oct 2022 14:19:45 +0200 Message-Id: <20221010121955.718168-6-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" ACPI ID of INT343A signals rt286 device for SKL, KBL and AML platforms. Add the missing AML entry. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/board_selection.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c index 87f9c18be238..95afbac0f358 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -29,6 +29,12 @@ static const struct dmi_system_id kbl_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "Skylake Y LPDDR3 RVP3"), }, }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), + DMI_MATCH(DMI_BOARD_NAME, "AmberLake Y"), + }, + }, {} }; From patchwork Mon Oct 10 12:19:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 614236 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6DEBC433F5 for ; Mon, 10 Oct 2022 12:06:29 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1DA83297E; Mon, 10 Oct 2022 14:05:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1DA83297E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403588; bh=b81rFCaucnf8oXxxRjBQGTwyXDPDKuYTsbOcBfqZy80=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=FvOMpVEueKVM1FzGNRlpFFvQqtEmfFI4sXT2cFPt1OYEFRke46d0jci91j4gyfpfU gf7+H54tgI7ut6zih34GpygFl8hhcjSzk4XrLX0smZrnxZhNUoTm8w77VoNBo7wZT3 OxwKVSRIJEOx7Fd+7d4axuxQqrxv+w3+r1AkTX8Q= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8FF3EF801D5; Mon, 10 Oct 2022 14:04:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BCA65F80578; Mon, 10 Oct 2022 14:04:09 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2FC50F80557 for ; Mon, 10 Oct 2022 14:04:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2FC50F80557 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Xoy4F7S2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403444; x=1696939444; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=b81rFCaucnf8oXxxRjBQGTwyXDPDKuYTsbOcBfqZy80=; b=Xoy4F7S28tKnqMwZvux4Vx/dHyL6wn1KY4GnCG/s4RRpknS7t4rs62eD TWNGoY1gK25Po+ooRl22MZu/wweu4t7inVnkoIl8cRIQgpSaEAuaP4DB3 ArFRqauyD7dA/zrLzsTXubIZzvrWsIYnvnosPHmjQEzVha4FReEPCRW+9 kxeNT1WaSD8akpK6Z4oKmkBv05BKvQgzFLZBs2kGYM5fFaScvQaFxeboB xtdFWFigHE7n+oJ6txIubjOGQHuclulQ80l2rxN/WFfEaKjUy5ir0m5xv BEbMbBHliIAcfdIe54UoQEV0/Qr+v5V/GkMErjqGOuL2tTEe9Gc8ROvon A==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346087" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346087" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078910" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078910" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:03:58 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 06/15] ASoC: Intel: avs: Support da7219 on both KBL and APL Date: Mon, 10 Oct 2022 14:19:46 +0200 Message-Id: <20221010121955.718168-7-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Amadeusz Sławiński KBL and APL devices use same codec but have different clock, so it must be set appropriately depending on device. Signed-off-by: Amadeusz Sławiński Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/boards/da7219.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c index 02ae542ad779..503a967a1c3a 100644 --- a/sound/soc/intel/avs/boards/da7219.c +++ b/sound/soc/intel/avs/boards/da7219.c @@ -6,6 +6,7 @@ // #include +#include #include #include #include @@ -80,7 +81,10 @@ static int avs_da7219_codec_init(struct snd_soc_pcm_runtime *runtime) int ret; jack = snd_soc_card_get_drvdata(card); - clk_freq = 19200000; + if (soc_intel_is_apl()) + clk_freq = 19200000; + else /* kbl */ + clk_freq = 24576000; ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, clk_freq, SND_SOC_CLOCK_IN); if (ret) { From patchwork Mon Oct 10 12:19:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 613784 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C96F1C433FE for ; Mon, 10 Oct 2022 12:06:44 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id F1DD52977; Mon, 10 Oct 2022 14:05:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F1DD52977 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403603; bh=jtW0eXebvQ2OpHqjN+yasCvxH7LVfYklxPV1iT6TSJo=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=D0PyTYEtr9dpSrgtNTXg+uJpeELrnJG+asoyHA3Q3hh2URc7Y3i+cZVcMufLt8h/K A/O338VW/igvZI1zVkQFZSAdh576y4U+s01EJHi13F4Au3PHJ/IxLf1LpgYKb12V3l K71a4SJ+mFqk63YmZkXsO3Olh6LteYizNxbn/H2g= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 398DBF80570; Mon, 10 Oct 2022 14:04:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 77916F80571; Mon, 10 Oct 2022 14:04:10 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E9C49F801D5 for ; Mon, 10 Oct 2022 14:04:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E9C49F801D5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="dZnVU/Ol" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403445; x=1696939445; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jtW0eXebvQ2OpHqjN+yasCvxH7LVfYklxPV1iT6TSJo=; b=dZnVU/OlKUqWW4N+kcDeSAZjmvSR2hLGyVzLDsTPRWhUA1YurzmSZmgQ R6poSH9AV9n46brlzfWbLlXf/SELD/zoGAzYFI9LzS7XhCrhL13uVfF5C dIbCWRa22xij/Rh8cV6KjhGrW/csVtTMIiSkGZcxBeZk/65MLBgJf1Z9s ZjQ7kLDrWthl7XVuxk9emJmBFWJMDs7giGZO671/bq2avCyDlTHEBOdGv DBUA1vfIkn3FbmMEGvst3VcEO2f1S9aDsvwkIRUZljy1QPncWER9rNETE 2x5Gf7aBk+dHxcm8WF7CIHNhd/hRye1t5Ayc70H7+5izndiR72zCr2KfV A==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346090" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346090" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078915" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078915" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:00 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 07/15] ASoC: Intel: avs: Add missing SKL-based device IDs Date: Mon, 10 Oct 2022 14:19:47 +0200 Message-Id: <20221010121955.718168-8-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Enable additional SKL-based configurations by filling device ID table with new entries. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index 58db13374166..6503c5bfd63d 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -667,7 +667,11 @@ static const struct avs_spec apl_desc = { static const struct pci_device_id avs_ids[] = { { PCI_VDEVICE(INTEL, 0x9d70), (unsigned long)&skl_desc }, /* SKL */ + { PCI_VDEVICE(INTEL, 0xa170), (unsigned long)&skl_desc }, /* SKL-H */ { PCI_VDEVICE(INTEL, 0x9d71), (unsigned long)&skl_desc }, /* KBL */ + { PCI_VDEVICE(INTEL, 0xa171), (unsigned long)&skl_desc }, /* KBL-H */ + { PCI_VDEVICE(INTEL, 0xa2f0), (unsigned long)&skl_desc }, /* KBL-S */ + { PCI_VDEVICE(INTEL, 0xa3f0), (unsigned long)&skl_desc }, /* CML-V */ { PCI_VDEVICE(INTEL, 0x5a98), (unsigned long)&apl_desc }, /* APL */ { PCI_VDEVICE(INTEL, 0x3198), (unsigned long)&apl_desc }, /* GML */ { 0 } From patchwork Mon Oct 10 12:19:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 613783 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 461BFC433F5 for ; Mon, 10 Oct 2022 12:07:18 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 484B6298D; Mon, 10 Oct 2022 14:06:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 484B6298D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403636; bh=xN+Dl4IyK8wO1+W3xgwz+tpP2k/nEyWk0uXkXJasap8=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=hJEYBop/3zP9pYLA0eaUFxL2QfSoBo6Rp+T41dhzhUi8axHsWis8e5xYmxUSI+x4c +NgE0zViS5zVLzYofcDyYsrIcbQaBxBOdP1Shj9D5eQmimJyygTk/cAB11GDGO1FSq Xk3g92FYPsKJUkIPqECjQobvdCvkM+TPFBz/qR60= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 3A318F8057E; Mon, 10 Oct 2022 14:04:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B13A1F80568; Mon, 10 Oct 2022 14:04:11 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 253F7F8055C for ; Mon, 10 Oct 2022 14:04:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 253F7F8055C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="oERwoxu1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403446; x=1696939446; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xN+Dl4IyK8wO1+W3xgwz+tpP2k/nEyWk0uXkXJasap8=; b=oERwoxu1nrhhRDcqkLm8eX7Cjzbc+w3225uYwnV1dkp9+X3QcflPibUw UKYXiB8RhNsy50TV66Y5nigs4cbNn1U2/FcUxrJPLw+TcwBOlnbEjXThr fKKZSBlQN5bY1hOswKzbVhYn6KFTeloQWyvwMt4Qgf2WkhKLzYGc7Plsg N5RTDb/H72arLMQHpVaMZqveK0LWgcrcEHoXJJhHCUXB5N7KOMWX6e4eN xMFMa+B6Zkd2IxZrEuCWGF9FxD3FcQAqw/Cr7gcTNCCOYBOo9rglo4e6h bcnCpd53jdt6q6Qsxa+EvVm2dhBTF2a61tSSPBvp+0ytYUIMzqNu9N+rk w==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346093" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346093" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078921" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078921" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:02 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 08/15] ASoC: Intel: avs: Simplify d0ix disabling routine Date: Mon, 10 Oct 2022 14:19:48 +0200 Message-Id: <20221010121955.718168-9-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" No need to atomic_add_return(1) when there is atomic_inc_return() available. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/ipc.c b/sound/soc/intel/avs/ipc.c index 77da206f7dbb..152f8d0bdf8e 100644 --- a/sound/soc/intel/avs/ipc.c +++ b/sound/soc/intel/avs/ipc.c @@ -74,7 +74,7 @@ int avs_dsp_disable_d0ix(struct avs_dev *adev) struct avs_ipc *ipc = adev->ipc; /* Prevent PG only on the first disable. */ - if (atomic_add_return(1, &ipc->d0ix_disable_depth) == 1) { + if (atomic_inc_return(&ipc->d0ix_disable_depth) == 1) { cancel_delayed_work_sync(&ipc->d0ix_work); return avs_dsp_set_d0ix(adev, false); } From patchwork Mon Oct 10 12:19:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 614235 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C8C03C433FE for ; Mon, 10 Oct 2022 12:06:57 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id F1BCB2992; Mon, 10 Oct 2022 14:06:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F1BCB2992 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403616; bh=H3vw6OArTHDdlxEgCq3Huqo/FgnDEZvJlpqeOHEjNZE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=N06iSZBPgFfjiS5k8SArJnW9jcWAxLaTC7kHUV+0maB2ShMtvYg2v084wa9sm05ra 67XOqKDv4/JvlVQ7x7m8jFbXsgOc9dmK7KgeJdRQ18iemljbFDDKBp44kQBKfwNV66 K9hsLva3iNJbxsbWVseG2RJWBHxZ3kVcPN9RObyM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BF879F8057C; Mon, 10 Oct 2022 14:04:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 85578F80566; Mon, 10 Oct 2022 14:04:11 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 4DD31F80568 for ; Mon, 10 Oct 2022 14:04:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4DD31F80568 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="VeDmuRTU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403447; x=1696939447; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=H3vw6OArTHDdlxEgCq3Huqo/FgnDEZvJlpqeOHEjNZE=; b=VeDmuRTUYJJ505aVlZhn7r5CuT5zg1lLDktfRy5qha1S6+leff47S1Pf ZOpaM3xEpISWEaXIwzHZYOIbtqlO70CzRuDpeRTnMrdzoqvMF8l6dtWdB tA9P0MeTWwVvxvFHfSzD6pVmfj7IN0Yk9qOeB+eAyFsUSVt9yJ2Ssc0IZ KfF4PSI3mzmux4FlLRJ3/IaI5OgdBd65LRsYkN5xbfajso10TcF3THbUj XRqVYN5FBTq1hSVbXpPSK6NA3UugWyu3beeYI0bM7bOEwj0AXuDsLEdWF lXgJrQ7SVI/zbWNyrZtVNvW1muKlsT3t+I8YEb0rym20w3fchh7OMGezI A==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346100" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346100" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078928" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078928" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:04 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 09/15] ASoC: Intel: avs: Add missing include to HDA board Date: Mon, 10 Oct 2022 14:19:49 +0200 Message-Id: <20221010121955.718168-10-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Amadeusz Sławiński In some configurations board fails to compile due to missing header. Add it to fix build. Signed-off-by: Amadeusz Sławiński Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/boards/hdaudio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c index 073663ba140d..e68c4c7aa2ba 100644 --- a/sound/soc/intel/avs/boards/hdaudio.c +++ b/sound/soc/intel/avs/boards/hdaudio.c @@ -6,6 +6,7 @@ // Amadeusz Slawinski // +#include #include #include #include From patchwork Mon Oct 10 12:19:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 614234 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 14DEDC433F5 for ; Mon, 10 Oct 2022 12:07:39 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2C5922980; Mon, 10 Oct 2022 14:06:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2C5922980 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403658; bh=QCz5bxo15VEkNJsvIJ4sTJx/idRityrxqBRwaMhJiHI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=UknWuvcmgZQBfb9EdYniDANIKEQ8RZAOjvlPBWMQHch9kOJkIyqb5XdKLeL9yakmC vF2wW9DHCU6P/hRdCZH+mwIFEsVNdKnKusKChTROcNUK7KeuZoS46Xo5eHJp+mAqnG LaI0MKg/XpQbt0muoGWTOfm+w9inpAuuNbsg+YLI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 139C8F805AB; Mon, 10 Oct 2022 14:04:17 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BECC9F80571; Mon, 10 Oct 2022 14:04:11 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2055EF80570 for ; Mon, 10 Oct 2022 14:04:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2055EF80570 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="IdYzUZoN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403449; x=1696939449; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QCz5bxo15VEkNJsvIJ4sTJx/idRityrxqBRwaMhJiHI=; b=IdYzUZoNvbpkYCsqAMnZPIEt13mJwr3M/TEluYt3JfgZiIDyJXKpXKOH llvQiTjQzEBGf9T9TpXf4MXFP2B2yM4lLpdfj8auMk3//AZ80ynyuAKeJ TJKqFxWOn3LB3/SmIG7oLX00kNEMNYlSuLZgGFtmOgzPZNgdstABTLcKx nNGZMMfiU1tQ4Quyvi20cC8VuSw+cP9KcFR/7dJT9iGh0RWxn4PTA5lpn v9MRoP4ERHuiKFsd+3yCo3dmzJJGLVGY8xViJEd/htZ6x4i1Vn2wjNH3k RfwZYfnn7nNhaBNlSYrnxy3K1QrygI73JgHxc+lX61/ar3Eow04lPlf/X Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346105" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346105" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078938" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078938" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:05 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 10/15] ASoC: Intel: avs: Do not reuse msg between different IPC handlers Date: Mon, 10 Oct 2022 14:19:50 +0200 Message-Id: <20221010121955.718168-11-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" While LOG_BUFFER_STATUS is a simple notification with only one meaningful field, same message ptr shall not be reused for two different handlers. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/apl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/avs/apl.c b/sound/soc/intel/avs/apl.c index b8e2b23c9f64..7c8ce98eda9d 100644 --- a/sound/soc/intel/avs/apl.c +++ b/sound/soc/intel/avs/apl.c @@ -133,12 +133,14 @@ static int apl_coredump(struct avs_dev *adev, union avs_notify_msg *msg) buf = apl_log_payload_addr(addr); memcpy_fromio(&layout, addr, sizeof(layout)); if (!apl_is_entry_stackdump(buf + layout.read_ptr)) { + union avs_notify_msg lbs_msg = AVS_NOTIFICATION(LOG_BUFFER_STATUS); + /* * DSP awaits the remaining logs to be * gathered before dumping stack */ - msg->log.core = msg->ext.coredump.core_id; - avs_dsp_op(adev, log_buffer_status, msg); + lbs_msg.log.core = msg->ext.coredump.core_id; + avs_dsp_op(adev, log_buffer_status, &lbs_msg); } pos = dump + AVS_FW_REGS_SIZE; From patchwork Mon Oct 10 12:19:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 614233 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9EAA7C433F5 for ; Mon, 10 Oct 2022 12:08:05 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C6E512987; Mon, 10 Oct 2022 14:07:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C6E512987 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403683; bh=aS5WA8WlMd5hWmep+lOPzVMTSzxAIOkf840xYz3U/KM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=DIlAMS44uhPXyJDKTRLY8kVcZAbksB9Em8I4+722Dao7ZZlmW3ezBZLU4v3M39Xhs z9m8o4vLGlMI2UJOgBd2sQW+uf1B673/TbK7nOROr+ggqxjC7aFQyFFeCX9cvUFwlG Qb5amUdbq0X5ROX8bzCvnhei3Osq3aNkNMwq3Q7s= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2BB3FF805B4; Mon, 10 Oct 2022 14:04:20 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A5677F8057A; Mon, 10 Oct 2022 14:04:16 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0546AF8057A for ; Mon, 10 Oct 2022 14:04:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0546AF8057A Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="loi3cWWM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403451; x=1696939451; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aS5WA8WlMd5hWmep+lOPzVMTSzxAIOkf840xYz3U/KM=; b=loi3cWWM5eaDTvR/WYOJVn6N1MNpixkhkQgHx9tC5k9eWLCjsN/OXLV6 cCo2h6u3/BhNPQiLkRy1i7nLyleesyyFkB7kqWDLHooeknv6wbuYck9M/ euvivs/vBa9irFIuLRBKtkMpSp5swAHXZ6b1TxzCRjCFJtkBnzSPjC+VJ 8tb+Js4mGKfZdBwSB5oz/SRys7+t1wS9yZX1LBmo2k2pT41b8zrUb1UOJ z3Lcfq6TFpoWBk8v0kSTPtZo3CkJx5zeiXQRGqixHYvQj2NNozUQF0/b1 qsyvcT1uXyi36s9EXxQLXP1viJiNMO0MlEg2HeWJ2R/yJPisPCQP66T/Q A==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346107" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346107" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078942" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078942" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:07 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 11/15] ASoC: Intel: avs: Do not treat unsupported IPCs as invalid Date: Mon, 10 Oct 2022 14:19:51 +0200 Message-Id: <20221010121955.718168-12-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Utilize NOT_SUPPORTED status code to differentiate between unsupported and invalid requests. Skip over error paths if it is the former that is communicated by the base firmware. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/avs.h | 4 +++- sound/soc/intel/avs/messages.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/avs.h b/sound/soc/intel/avs/avs.h index 92e37722d280..91f78eb11bc1 100644 --- a/sound/soc/intel/avs/avs.h +++ b/sound/soc/intel/avs/avs.h @@ -220,8 +220,10 @@ static inline void avs_ipc_err(struct avs_dev *adev, struct avs_ipc_msg *tx, /* * If IPC channel is blocked e.g.: due to ongoing recovery, * -EPERM error code is expected and thus it's not an actual error. + * + * Unsupported IPCs are of no harm either. */ - if (error == -EPERM) + if (error == -EPERM || error == AVS_IPC_NOT_SUPPORTED) dev_dbg(adev->dev, "%s 0x%08x 0x%08x failed: %d\n", name, tx->glb.primary, tx->glb.ext.val, error); else diff --git a/sound/soc/intel/avs/messages.h b/sound/soc/intel/avs/messages.h index c0f90dba9af8..02b3b7a74783 100644 --- a/sound/soc/intel/avs/messages.h +++ b/sound/soc/intel/avs/messages.h @@ -150,6 +150,8 @@ union avs_module_msg { }; } __packed; +#define AVS_IPC_NOT_SUPPORTED 15 + union avs_reply_msg { u64 val; struct { From patchwork Mon Oct 10 12:19:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 613782 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C317C433FE for ; Mon, 10 Oct 2022 12:07:47 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7915129A2; Mon, 10 Oct 2022 14:06:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7915129A2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403665; bh=Kzbz2//MEbFomVYT3Je8Ry2vhVhj4UV2as/D/dMydqQ=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=lzKdENibKgMM/Q6nEsQ5GSesIVFYFJxvJHanlQSy+6dwF24xSar1SrI75JdBOrlvl KS4nD60Gd/FlQbsPfGIYBTuXV4zqoo0VLPs/1Ijdn7nAhUdXnipFpWbH8jS06QNh7s qMQ4xZ0FacakMBKJxBaOEylJTur/pYOymhETFh5U= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id AA0C6F805AF; Mon, 10 Oct 2022 14:04:19 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4A1DEF805AC; Mon, 10 Oct 2022 14:04:16 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 596B5F80588 for ; Mon, 10 Oct 2022 14:04:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 596B5F80588 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="H5LQ/miQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403454; x=1696939454; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Kzbz2//MEbFomVYT3Je8Ry2vhVhj4UV2as/D/dMydqQ=; b=H5LQ/miQ+lpmphvQtg1zUiKiWmrF2tYVadDy1N+0rNiV0iy4MSVXcfjQ HwNSjxr225CHI4ZhkoRrMlYZScTMckanZNDiAKhX/45ppi0xi6QPklSJo IaogV3sc0u2gzuF1b6zA95UsWqRLh4czGejB/0r6bkCB7vAh2BvYbgToY NppItEKppf7sDLt9YnJs3GMtIDoXJPmOgkT/4ZK6MFhWeSRyis8Tkj1le 9PZEvK/Wd+GAJiDUUqEK0EA3ifFM4dMB5xOgALk5vsxYMpRN08xzlUtYl pSiCrJ1Iz6qp1/dBNAooXk4/63bdvitMNVHX4CmdoGkA6M+egp6hBkj+E w==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346119" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346119" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078947" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078947" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:09 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 12/15] ASoC: Intel: avs: Do not print IPC error message twice Date: Mon, 10 Oct 2022 14:19:52 +0200 Message-Id: <20221010121955.718168-13-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" ENABLE_LOGS and SYSTEM_TIME IPCs call LARGE_CONFIG_SET internally which dumps an error message in case of an error. There is no need to repeat the process in the top level handler. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/messages.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/sound/soc/intel/avs/messages.c b/sound/soc/intel/avs/messages.c index d4bcee1aabcf..6b0fecbf07c3 100644 --- a/sound/soc/intel/avs/messages.c +++ b/sound/soc/intel/avs/messages.c @@ -687,20 +687,13 @@ int avs_ipc_get_modules_info(struct avs_dev *adev, struct avs_mods_info **info) int avs_ipc_set_enable_logs(struct avs_dev *adev, u8 *log_info, size_t size) { - int ret; - - ret = avs_ipc_set_large_config(adev, AVS_BASEFW_MOD_ID, AVS_BASEFW_INST_ID, - AVS_BASEFW_ENABLE_LOGS, log_info, size); - if (ret) - dev_err(adev->dev, "enable logs failed: %d\n", ret); - - return ret; + return avs_ipc_set_large_config(adev, AVS_BASEFW_MOD_ID, AVS_BASEFW_INST_ID, + AVS_BASEFW_ENABLE_LOGS, log_info, size); } int avs_ipc_set_system_time(struct avs_dev *adev) { struct avs_sys_time sys_time; - int ret; u64 us; /* firmware expects UTC time in micro seconds */ @@ -708,12 +701,8 @@ int avs_ipc_set_system_time(struct avs_dev *adev) sys_time.val_l = us & UINT_MAX; sys_time.val_u = us >> 32; - ret = avs_ipc_set_large_config(adev, AVS_BASEFW_MOD_ID, AVS_BASEFW_INST_ID, - AVS_BASEFW_SYSTEM_TIME, (u8 *)&sys_time, sizeof(sys_time)); - if (ret) - dev_err(adev->dev, "set system time failed: %d\n", ret); - - return ret; + return avs_ipc_set_large_config(adev, AVS_BASEFW_MOD_ID, AVS_BASEFW_INST_ID, + AVS_BASEFW_SYSTEM_TIME, (u8 *)&sys_time, sizeof(sys_time)); } int avs_ipc_copier_set_sink_format(struct avs_dev *adev, u16 module_id, From patchwork Mon Oct 10 12:19:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 613781 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E29B2C433FE for ; Mon, 10 Oct 2022 12:08:21 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 133B5299F; Mon, 10 Oct 2022 14:07:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 133B5299F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403700; bh=1B2hUD1j7bRc11+vDf5SX1yy256UWJMaQb7ipbR3I5g=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=HbDcVFZR+CtE57itsBxwwaifM4Fzq0oapT3KiaAtUV9GKsIy/ZMiqdAv7+OP9Rh3a EeO5xBqslRkIjsMurRDN2GDjeR8j7VKhkFMNAW/7KPApIlOPiBVlUI6TKzYl1lRTLl VgaNQu5ktMu96iZSjoPv+9JWFJIq3NOqVKykLcXA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BD8A3F805B6; Mon, 10 Oct 2022 14:04:22 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5F723F805AF; Mon, 10 Oct 2022 14:04:17 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E4D1CF805A0 for ; Mon, 10 Oct 2022 14:04:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E4D1CF805A0 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="QVRFh22w" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403455; x=1696939455; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1B2hUD1j7bRc11+vDf5SX1yy256UWJMaQb7ipbR3I5g=; b=QVRFh22wuTr2ZkqYjhgAsiCkBcfUUR06ddro9JGk4wDWJdrWzuQUgjqb RqQTH+9rpl40vg3larj/9/R9wlq5MiyRFeAuCv/aOC8QqxynkWQiuHqyE PjXTjj7sjMitLaBsmlC8Gl5Gru1ZyAXW4Ty1Zn1uULLL4lsgAxHuOdG0l CTdlw/L0aNnKzga/kJPRf9dSpe8854+w0D8PWSerY1cbyzz9798yXCYK1 RnKMOrLuVdtlOjh4Q4l66CX4yGE00GQyllM+6t6Fw3P6d+tXZfwbQtdM8 zwNeW54s9D5xVwvFD0/qYfb6sQo85+IkuPQ+bj7Gqe/MjFsgi5Lh/2ndx w==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346124" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346124" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078956" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078956" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:11 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 13/15] ASoC: Intel: avs: Simplify ignore_fw_version description Date: Mon, 10 Oct 2022 14:19:53 +0200 Message-Id: <20221010121955.718168-14-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Reword the parameter description to drop any confusion regarding its purpose. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/loader.c b/sound/soc/intel/avs/loader.c index 9e3f8ff33a87..2d80a271eb50 100644 --- a/sound/soc/intel/avs/loader.c +++ b/sound/soc/intel/avs/loader.c @@ -43,7 +43,7 @@ /* Occasionally, engineering (release candidate) firmware is provided for testing. */ static bool debug_ignore_fw_version; module_param_named(ignore_fw_version, debug_ignore_fw_version, bool, 0444); -MODULE_PARM_DESC(ignore_fw_version, "Verify FW version 0=yes (default), 1=no"); +MODULE_PARM_DESC(ignore_fw_version, "Ignore firmware version check 0=no (default), 1=yes"); #define AVS_LIB_NAME_SIZE 8 From patchwork Mon Oct 10 12:19:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 613780 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3FF6C433FE for ; Mon, 10 Oct 2022 12:08:47 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id F087D29AC; Mon, 10 Oct 2022 14:07:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F087D29AC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403726; bh=y30PTgU8msnrWFzBoNM3GWxnpWoJ49lG31Ykkyf5N+k=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=grswbDURWuaz987DUKNum9VxXitZanz1nggi+dFpn3i69N7jbBO+dhPdq6DRqTcIi trdIOmLLhNQHbtqHSaA6e/KTW51M8YtBEPPwaumP792S9NHv93vFQoFSq+eOpwtUc8 GIj8a5QpqaUgCXAOrwyRdAjNALrfJx4VsRthGJ0Q= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C3B4EF805C2; Mon, 10 Oct 2022 14:04:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8693BF805BB; Mon, 10 Oct 2022 14:04:20 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C7B0DF8057A for ; Mon, 10 Oct 2022 14:04:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C7B0DF8057A Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="SoHYNk4W" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403457; x=1696939457; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y30PTgU8msnrWFzBoNM3GWxnpWoJ49lG31Ykkyf5N+k=; b=SoHYNk4W1J7FV4iQ16HhMGgOg6QwTL3W5itqEDtO+KHZ0eU2zp3C3HK6 GZy+akDvHYInDYPCIw7KCit4QgiB2WPuABZTJhgAf4d9PkuHTFi1GnH+J 5UTJFaqFf4f79nsg6zP63xt/kOldSxSY8QcnqU6eza09lM6pEmwYfZUnQ sY3Su+DZQq9ASR3rhgQC2c8x+ymR0x4X6WRQNNnj3J07jULPrISEPzCST 8S70GKlcYGHeqONOdWL9szbntUQKV+796UlWKuLZvKSI6BQZUjUZxyhzm Biz/mqa6wRGwDuwsQxbaV0QQWttlbCtD4OzoA8IegLm3+vnuxSBUQT2zw A==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346132" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346132" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078961" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078961" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:13 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 14/15] ASoC: Intel: avs: Simplify log control for SKL Date: Mon, 10 Oct 2022 14:19:54 +0200 Message-Id: <20221010121955.718168-15-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Loop only till the actual number of AudioDSP cores, not the value of mask made from said number. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/skl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/avs/skl.c b/sound/soc/intel/avs/skl.c index bda5ec7510fe..dc98b5cf900f 100644 --- a/sound/soc/intel/avs/skl.c +++ b/sound/soc/intel/avs/skl.c @@ -28,12 +28,12 @@ static int skl_enable_logs(struct avs_dev *adev, enum avs_log_enable enable, u32 info->core_mask = resource_mask; if (enable) - for_each_set_bit(i, &resource_mask, GENMASK(num_cores, 0)) { + for_each_set_bit(i, &resource_mask, num_cores) { info->logs_core[i].enable = enable; info->logs_core[i].min_priority = *priorities++; } else - for_each_set_bit(i, &resource_mask, GENMASK(num_cores, 0)) + for_each_set_bit(i, &resource_mask, num_cores) info->logs_core[i].enable = enable; ret = avs_ipc_set_enable_logs(adev, (u8 *)info, size); From patchwork Mon Oct 10 12:19:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 614232 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47BE2C433FE for ; Mon, 10 Oct 2022 12:08:35 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6E22829A4; Mon, 10 Oct 2022 14:07:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6E22829A4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1665403713; bh=757jksTD/InYrlah3Xg03lR97thx/bEezOxBraQzLUY=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Doh/ms2EvZ8IbLrMxLN31UMqGmFTLGcg3nrqQ+niri64+Dj/0IXH2LD1qzMQ9ug6U eTEq6CTbEBanPZery2HoHT44v9jW5IjmUJEtHcP3mb57jTonyYX3Gs+zzxXytZUHzk b7BsE+j7mT/NIiSRzjcpowDCnK/lafR0Jt50yBv0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 51A03F805BA; Mon, 10 Oct 2022 14:04:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5513DF805BA; Mon, 10 Oct 2022 14:04:20 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id B41A4F805AE for ; Mon, 10 Oct 2022 14:04:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B41A4F805AE Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="P6o1Su5Z" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665403458; x=1696939458; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=757jksTD/InYrlah3Xg03lR97thx/bEezOxBraQzLUY=; b=P6o1Su5ZWa8nGGHFwLN+0WS7o8V1+qlAB6aoHENAZ2FkBBKAl4d8YvgJ DofjMXbouem3Ur/lTJIDd1gW1x7+rl5tCh/spUXC5FYHu19zeTFwR5dZ8 K8UVz1N1B2zo99kHeqKSqiSbVUuCnBlyJTsb8x1PpXRpJeH9fsGF1yqas CubsyrMLLu0PmMzj4Zj3bum9kY0mZecg2dJPmVDwMII47WBus6ieDUpgc eYMm/CzfqBylmoYMYpUoksopY4foHav5r8ucz2Kf2bnJZDO2MPSBvCioS FYROimkJvUfpbrMTIjMgmcbT0vQ+LP7u8Dsi9lqBU5j8THlGN3qQ7ufyA Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="368346135" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="368346135" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2022 05:04:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10495"; a="871078965" X-IronPort-AV: E=Sophos;i="5.95,173,1661842800"; d="scan'208";a="871078965" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga006.fm.intel.com with ESMTP; 10 Oct 2022 05:04:15 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH v2 15/15] ASoC: codecs: hda: Fix spelling error in log message Date: Mon, 10 Oct 2022 14:19:55 +0200 Message-Id: <20221010121955.718168-16-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010121955.718168-1-cezary.rojewski@intel.com> References: <20221010121955.718168-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Cc: Cezary Rojewski , pierre-louis.bossart@linux.intel.com, tiwai@suse.com, hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" To improve readability. Signed-off-by: Cezary Rojewski --- sound/soc/codecs/hda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c index ad20a3dff9b7..712d8ba85f0e 100644 --- a/sound/soc/codecs/hda.c +++ b/sound/soc/codecs/hda.c @@ -213,7 +213,7 @@ static int hda_codec_probe(struct snd_soc_component *component) patch = (hda_codec_patch_t)codec->preset->driver_data; if (!patch) { - dev_err(&hdev->dev, "no patch specified?\n"); + dev_err(&hdev->dev, "no patch specified\n"); ret = -EINVAL; goto err; }