From patchwork Wed Nov 28 12:57:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 152251 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1052456ljp; Wed, 28 Nov 2018 04:58:06 -0800 (PST) X-Google-Smtp-Source: AFSGD/W1HZLtxJ6DrcOFVRzZJqCxjxp2VdPFgevrcGPw1q4rv4iRLNMU46AJHtq+sKvYaxMEe/23 X-Received: by 2002:a1c:5585:: with SMTP id j127-v6mr2490461wmb.127.1543409886340; Wed, 28 Nov 2018 04:58:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543409886; cv=none; d=google.com; s=arc-20160816; b=C2fwP1rQHjejb5bzbFVb3qe3I57lpOj4XSTG3OpSG7juxbIRbc6ZTI47/0OPFIqfZf txY/26mBZpGiQTObdqAZZ0alWpvuCRgeFZJpfGGWWrAZBNw87DJZSFa/KeYk9T3BxfVS IDt4b2S8TUgV1Hyt7imQBs73JhVxjR7nt1GFnpatDZ1mu4FJSO2PjIefX7se9PO9Iemq 7ak0vQ2KJiroTRo0uLxu77+EEiK7DT4GjSHixhKeVZ2bzIfdw+XhUqAIHI2KQRommLfn GzRge6pRrrBRP2l742IYsbL4LZ6SQLw7R0WBDpso0/mfIBh9kpfFHU0SW0zqmSL+hr5Q bfkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=/dkIuurzY7CG+64KoNAb5jvTQgrk0QGM7UxpgwuCCNw=; b=GF5HIr97xOQNlqiQ7EVz8w+/rLJ//Vkui0ItxiFJ8g4yRSvo5jX7HpweJScW6pXZ6M yL2hf1+mKSuNHAs4aTantBihC27b24mAKcx51cJ3G587n62GKltr4lhQBE8A66xEMie1 XJ6aabPmFvOOH3ICcOuM3MpibGc6MzVgIp8OPKoIq6drtMP73HHnA2MOTTWOE/L/Enc0 dUJsDVFAKhEEIephzhgy05sgPIzqhoaVn/0oEnhDiy4IvhUhFbszpUpm97D884Xh2LpR hNb1PXijjXJ6pz/oFrPTQiYSjIDuwItacsI4+2T9lznsXnVsopC6uKir7b7Nsj4KT5Vz fK9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=d2xIy4Pa; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id s7si5673039wri.317.2018.11.28.04.58.06; Wed, 28 Nov 2018 04:58:06 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=d2xIy4Pa; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 665FA267B58; Wed, 28 Nov 2018 13:57:50 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0D281267B62; Wed, 28 Nov 2018 13:57:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 0CEFB267B72 for ; Wed, 28 Nov 2018 13:57:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=gc7Qby5EynpYhs80f10QSKXo/dKcyNoT0tadk50cDu0=; b=d2xIy4PaWaX2 rdy7n1ysOzlTivQkDyOlz0b1CVO5zf2gtgIUC0QM6BC1s0kQRSTtCW9glnkaIBK94hvt+EzkX0M7t B0QSkkglHNGaT3TYf8QRCTRZv0dr764257v30G1yt6EoJS/uPL7qea60LuyBgnii/yMl9iBlRgJju dp/I8=; Received: from 92.40.248.202.threembb.co.uk ([92.40.248.202] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gRzPP-0005HE-Sm; Wed, 28 Nov 2018 12:57:39 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id DD6F5440078; Wed, 28 Nov 2018 12:57:38 +0000 (GMT) From: Mark Brown To: Subhransu S. Prusty In-Reply-To: Message-Id: <20181128125738.DD6F5440078@finisterre.ee.mobilebroadband> Date: Wed, 28 Nov 2018 12:57:38 +0000 (GMT) Cc: Vinod Koul , Sriram Periyasamy , alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 61f94ee4a7435c35d78b22e4ae6e0551908000ae Mon Sep 17 00:00:00 2001 From: "Subhransu S. Prusty" Date: Mon, 29 Jan 2018 21:46:00 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC If mclk/sclk is already running, FW responds with IPC reply MCLK/SCLK already running. Add these to the IPC reply lookup table. Signed-off-by: Subhransu S. Prusty Signed-off-by: Sriram Periyasamy Signed-off-by: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/skylake/skl-sst-ipc.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.19.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c index 8708755a8f9a..9f3ce73593ae 100644 --- a/sound/soc/intel/skylake/skl-sst-ipc.c +++ b/sound/soc/intel/skylake/skl-sst-ipc.c @@ -249,6 +249,8 @@ enum skl_ipc_glb_reply { IPC_GLB_REPLY_INVALID_CONFIG_DATA_LEN = 121, IPC_GLB_REPLY_GATEWAY_NOT_INITIALIZED = 140, IPC_GLB_REPLY_GATEWAY_NOT_EXIST = 141, + IPC_GLB_REPLY_SCLK_ALREADY_RUNNING = 150, + IPC_GLB_REPLY_MCLK_ALREADY_RUNNING = 151, IPC_GLB_REPLY_PPL_NOT_INITIALIZED = 160, IPC_GLB_REPLY_PPL_NOT_EXIST = 161, @@ -401,6 +403,10 @@ struct skl_ipc_err_map { static struct skl_ipc_err_map skl_err_map[] = { {"DSP out of memory", IPC_GLB_REPLY_OUT_OF_MEMORY, -ENOMEM}, {"DSP busy", IPC_GLB_REPLY_BUSY, -EBUSY}, + {"SCLK already running", IPC_GLB_REPLY_SCLK_ALREADY_RUNNING, + IPC_GLB_REPLY_SCLK_ALREADY_RUNNING}, + {"MCLK already running", IPC_GLB_REPLY_MCLK_ALREADY_RUNNING, + IPC_GLB_REPLY_MCLK_ALREADY_RUNNING}, }; static int skl_ipc_set_reply_error_code(struct sst_generic_ipc *ipc, u32 reply)