From patchwork Tue Apr 17 11:28:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133538 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp4599673ljb; Tue, 17 Apr 2018 04:29:11 -0700 (PDT) X-Google-Smtp-Source: AIpwx49j+PfECnDooKFpGhPviz6W6UAtIemy2nrYPXbQo3uJQqDve1kcE3QhZYcTyJv+wxSgWTn8 X-Received: by 10.28.48.149 with SMTP id w143mr775497wmw.88.1523964551450; Tue, 17 Apr 2018 04:29:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523964551; cv=none; d=google.com; s=arc-20160816; b=plWzEN898M9CVNcdlx1N8uif8qXTkhd9BG4EvSZcKUfaEB1RxVdpP0kpEBscK3z0GB VDzVH22Hcu0HyeAYpYzx0/I2vkCZNhp3+ovZshyzKkwYwfOj5A0Ft/vEMIklvuCrbROH NYYEAM3/IRFx+AaqwRdXIg5uD1Yd2kVLdWPpYkTxRb+s6AYDp65df9ocwF3NxjhhNAuE tsiWff5bxdSPv2bFRHdNgrH0Ut2F9/vSC2ryFHEGYjGC9ofCqGGJBSADIdDGr9kYhi5g 4essifv1mA5TK3RpfVbt3NqBSuw+m8CoWvPeDRK3cf02ODe7dY5ccl9/2MlRKr3GBvup r9aQ== 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:arc-authentication-results; bh=X4P0Uox8qFcDqDFM0lYe3A2DJOdRytsMwWQ48Od6qyc=; b=Jghmg1K1npHPVCco+/HdGrbFwSr7KoAED0LBO4SJ4LaDNe7chiwc5ZYv77YVmQydKp tByvfoNjP77KAWm/jQ1+neRYq7ut8W6a5AiL1vV1efAljJI8Lo2+Mk8Yf1lnaB/OexQt HZh51h6nPwvNPsox+b+Us09GeVNeZmvVeuoL/w7bukTB/tyKmULTDZ6uQGHUy4yF87NM ZJDJbOoM6xmhC3iyfP0C9zCkX0huaUQBeLsU6TikShdXwecoov6UnGTHvyENOJyWqZTG 24afseopE/uVK1+EUg0aREU6+lsXgZKoPVARwj1KRHWY2z85QlN/66GtsToP+2vJJFl1 kHGA== 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=KEJzmWwb; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id i83si727031wma.196.2018.04.17.04.29.11; Tue, 17 Apr 2018 04:29:11 -0700 (PDT) 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=KEJzmWwb; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3A25D267623; Tue, 17 Apr 2018 13:28:59 +0200 (CEST) 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 C4E4E267600; Tue, 17 Apr 2018 13:28:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS 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 519CE2675F4 for ; Tue, 17 Apr 2018 13:28:51 +0200 (CEST) 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=/trLse+TpUWPV3DvM+nOj0XfFzmTZSmiOLSHC8Qx4n8=; b=KEJzmWwbvfCV uYmRtBtXoujH9/df2jMvXT90aPkSjkn5NupnQqmTGKR+XfIwpzH0rDp15WEEvtBh0njHNwQ6J9hnv 69QzPglx5BDtQk3fwCgrZin+xmYAQjgI7cf0R4ovQLuJrmvETQ0QCfC9Go1Xc+VPjji+VkoCSOSOH aoNF0=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f8On1-0007cN-Tw; Tue, 17 Apr 2018 11:28:47 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f8On1-0000Lc-GL; Tue, 17 Apr 2018 12:28:47 +0100 From: Mark Brown To: Pradeep Tewani In-Reply-To: <1522651550-27236-4-git-send-email-sriramx.periyasamy@intel.com> Message-Id: Date: Tue, 17 Apr 2018 12:28:47 +0100 Cc: alsa-devel@alsa-project.org, Takashi Iwai , Sriram Periyasamy , Liam Girdwood , Patches Audio , Mark Brown , Vinod Koul Subject: [alsa-devel] Applied "ASoC: Intel: Skylake: Unify the fw ops for SKL and KBL" 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: Unify the fw ops for SKL and KBL 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 651e4890930d10d009a9a8b829a7177670975ec7 Mon Sep 17 00:00:00 2001 From: Pradeep Tewani Date: Mon, 2 Apr 2018 12:15:50 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Unify the fw ops for SKL and KBL SKL and KBL driver used separate set of fw ops for library loading. However, with the unification of fw binary, use the common set of fw ops for both Signed-off-by: Pradeep Tewani Signed-off-by: Sriram Periyasamy Signed-off-by: Mark Brown --- sound/soc/intel/skylake/skl-messages.c | 2 +- sound/soc/intel/skylake/skl-sst-dsp.h | 3 --- sound/soc/intel/skylake/skl-sst.c | 34 ++------------------------ 3 files changed, 3 insertions(+), 36 deletions(-) -- 2.17.0 _______________________________________________ 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-messages.c b/sound/soc/intel/skylake/skl-messages.c index 57d4a58522a6..dd590a1c58e2 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -225,7 +225,7 @@ static const struct skl_dsp_ops dsp_ops[] = { .id = 0x9d71, .num_cores = 2, .loader_ops = skl_get_loader_ops, - .init = kbl_sst_dsp_init, + .init = skl_sst_dsp_init, .init_fw = skl_sst_init_fw, .cleanup = skl_sst_dsp_cleanup }, diff --git a/sound/soc/intel/skylake/skl-sst-dsp.h b/sound/soc/intel/skylake/skl-sst-dsp.h index 12fc9a73dc8a..e1d6f6719f7e 100644 --- a/sound/soc/intel/skylake/skl-sst-dsp.h +++ b/sound/soc/intel/skylake/skl-sst-dsp.h @@ -231,9 +231,6 @@ int skl_dsp_boot(struct sst_dsp *ctx); int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, const char *fw_name, struct skl_dsp_loader_ops dsp_ops, struct skl_sst **dsp); -int kbl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, - const char *fw_name, struct skl_dsp_loader_ops dsp_ops, - struct skl_sst **dsp); int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, const char *fw_name, struct skl_dsp_loader_ops dsp_ops, struct skl_sst **dsp); diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c index 5a7e41b65ef3..5951bbdf1f1a 100644 --- a/sound/soc/intel/skylake/skl-sst.c +++ b/sound/soc/intel/skylake/skl-sst.c @@ -390,7 +390,7 @@ static int skl_transfer_module(struct sst_dsp *ctx, const void *data, } static int -kbl_load_library(struct sst_dsp *ctx, struct skl_lib_info *linfo, int lib_count) +skl_load_library(struct sst_dsp *ctx, struct skl_lib_info *linfo, int lib_count) { struct skl_sst *skl = ctx->thread_context; struct firmware stripped_fw; @@ -508,16 +508,7 @@ static const struct skl_dsp_fw_ops skl_fw_ops = { .set_state_D3 = skl_set_dsp_D3, .load_fw = skl_load_base_firmware, .get_fw_errcode = skl_get_errorcode, - .load_mod = skl_load_module, - .unload_mod = skl_unload_module, -}; - -static const struct skl_dsp_fw_ops kbl_fw_ops = { - .set_state_D0 = skl_set_dsp_D0, - .set_state_D3 = skl_set_dsp_D3, - .load_fw = skl_load_base_firmware, - .get_fw_errcode = skl_get_errorcode, - .load_library = kbl_load_library, + .load_library = skl_load_library, .load_mod = skl_load_module, .unload_mod = skl_unload_module, }; @@ -573,27 +564,6 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, } EXPORT_SYMBOL_GPL(skl_sst_dsp_init); -int kbl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, - const char *fw_name, struct skl_dsp_loader_ops dsp_ops, - struct skl_sst **dsp) -{ - struct sst_dsp *sst; - int ret; - - ret = skl_sst_dsp_init(dev, mmio_base, irq, fw_name, dsp_ops, dsp); - if (ret < 0) { - dev_err(dev, "%s: Init failed %d\n", __func__, ret); - return ret; - } - - sst = (*dsp)->dsp; - sst->fw_ops = kbl_fw_ops; - - return 0; - -} -EXPORT_SYMBOL_GPL(kbl_sst_dsp_init); - int skl_sst_init_fw(struct device *dev, struct skl_sst *ctx) { int ret;