From patchwork Fri Oct 19 12:33:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149271 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3248770lji; Fri, 19 Oct 2018 05:33:56 -0700 (PDT) X-Google-Smtp-Source: ACcGV60aO9266oJVpepCjm7TM6ZgpXoQbKwNMpMq+FXYYUEdSpukpKb8UQ0rdPJ0UrlETRj1gXoO X-Received: by 2002:a1c:5702:: with SMTP id l2-v6mr4379617wmb.83.1539952436354; Fri, 19 Oct 2018 05:33:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539952436; cv=none; d=google.com; s=arc-20160816; b=N/DUrkbqr3SK8lV5J7AXZPLt4kxsiLX/8r+QFS7v0XA5aUlx7Q7PxeXaYSdPyYd2ve JX2ednonS5vwWmdZ+L/CP8bviDg04L6Rw9sGWz6wdRhiNOW9Kxy+MlmQo5xMeT8+/xzk BL6kFJsaYmNol2RkPvT5eukCj9ABjVSwgA/IWCJdwLusL6fOULGXW2H9blEoazOkD50x omwejpWA0YcW3z8TXFN7VRE5/g5fRZjrr1k132K8dN5ZpNc1jbI4Ea4/08wwreOqjmGN YBxd4Zgc9666b04QAwNVyklSrduhZilFcdXmswn2WYFhPkXC7R3DFzSryds6msL4TUcS 63hA== 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=rAq7p7E6gOCWNyHXWym4tKt0kFCILXR3KZcfph49VGE=; b=GmbLuT4q9cvhSYOQzdIh54SCoXMyiO6dej28t4OMAv+pHEZNcHVeaMbQ6TLROu3Ffd lXQYnya/cE2V0u3iStuEvH0W+r/k8kMQw8PK4TTs/xxRHJWxVlwWXG44L+JdZYS0/dqT 4Gs6OKJpwZjjDLikGDrH9yalonuH1F/GPk1GGQSuosJjZ4rDtR31IjZYmfuOhCpvcmKg XSYwFZ+uz8rS0VT4FNrKwxhRSNENXXg3MlmJqexGwqeZjdTTdpWyzsCGmQ+RMKE91NqM 6KscqAUl1etLGW3tBkQpW0Wlkvd+FURdWml10rBD53B6IvNRxCmH4hhTwM5f6mZLiZs6 6vTA== 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=vxpGB2HD; 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 h78-v6si2550958wme.169.2018.10.19.05.33.56; Fri, 19 Oct 2018 05:33:56 -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=vxpGB2HD; 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 4457E2679EF; Fri, 19 Oct 2018 14:33:51 +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 AE81C267967; Fri, 19 Oct 2018 14:33:48 +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 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 1802A267950 for ; Fri, 19 Oct 2018 14:33:47 +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=NHtWvGj+g023AgWcJkgLOcwAT2K/8dFZJWfgKSkG3YA=; b=vxpGB2HDUNpG NdfkZCTluNAGvihLluuatCtEwnG6tMN9u3OAL3imSEuiBAVvWMJp8X5OSOFX6dd67Mj7o9zKwBM5Q vvSNXC7oXmTXmDF6mx+rytJcLkVFecJOTiRgOZd+4kWmvdErq0ffMV6ibM239Rl2teOqrZZqUsA2r H2vrE=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gDTyL-00006P-Ik; Fri, 19 Oct 2018 12:33:45 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 55FCE1122548; Fri, 19 Oct 2018 13:33:45 +0100 (BST) From: Mark Brown To: Richard Fitzgerald In-Reply-To: Message-Id: <20181019123345.55FCE1122548@debutante.sirena.org.uk> Date: Fri, 19 Oct 2018 13:33:45 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: wm_adsp: Rename memory fields in wm_adsp_buffer" 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: wm_adsp: Rename memory fields in wm_adsp_buffer 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 2a2aefa41ce48ace8e1e963cb10c3f5ff43aa994 Mon Sep 17 00:00:00 2001 From: Richard Fitzgerald Date: Fri, 19 Oct 2018 13:25:15 +0100 Subject: [PATCH] ASoC: wm_adsp: Rename memory fields in wm_adsp_buffer The wm_adsp_buffer struct is the control header of a circular buffer used to transfer data from the firmware over the control interface to an ALSA compressed stream. The original names of the fields pointing to the data buffer were based on ADSP2V2 memory layout where they correspond to {XM, XM, YM}. But this circular buffer could be used on other types of DSP core that have different memory region types. Also the names and description of the size fields were not very clear. The field names and descriptions have been changed to be generic and not imply any particular memory types. This patch updates the wm_adsp driver to the new field names. Signed-off-by: Richard Fitzgerald Signed-off-by: Mark Brown --- sound/soc/codecs/wm_adsp.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index f61656070225..7ae10c632614 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -311,12 +311,12 @@ struct wm_adsp_alg_xm_struct { }; struct wm_adsp_buffer { - __be32 X_buf_base; /* XM base addr of first X area */ - __be32 X_buf_size; /* Size of 1st X area in words */ - __be32 X_buf_base2; /* XM base addr of 2nd X area */ - __be32 X_buf_brk; /* Total X size in words */ - __be32 Y_buf_base; /* YM base addr of Y area */ - __be32 wrap; /* Total size X and Y in words */ + __be32 buf1_base; /* Base addr of first buffer area */ + __be32 buf1_size; /* Size of buf1 area in DSP words */ + __be32 buf2_base; /* Base addr of 2nd buffer area */ + __be32 buf1_buf2_size; /* Size of buf1+buf2 in DSP words */ + __be32 buf3_base; /* Base addr of buf3 area */ + __be32 buf_total_size; /* Size of buf1+buf2+buf3 in DSP words */ __be32 high_water_mark; /* Point at which IRQ is asserted */ __be32 irq_count; /* bits 1-31 count IRQ assertions */ __be32 irq_ack; /* acked IRQ count, bit 0 enables IRQ */ @@ -393,18 +393,18 @@ struct wm_adsp_buffer_region_def { static const struct wm_adsp_buffer_region_def default_regions[] = { { .mem_type = WMFW_ADSP2_XM, - .base_offset = HOST_BUFFER_FIELD(X_buf_base), - .size_offset = HOST_BUFFER_FIELD(X_buf_size), + .base_offset = HOST_BUFFER_FIELD(buf1_base), + .size_offset = HOST_BUFFER_FIELD(buf1_size), }, { .mem_type = WMFW_ADSP2_XM, - .base_offset = HOST_BUFFER_FIELD(X_buf_base2), - .size_offset = HOST_BUFFER_FIELD(X_buf_brk), + .base_offset = HOST_BUFFER_FIELD(buf2_base), + .size_offset = HOST_BUFFER_FIELD(buf1_buf2_size), }, { .mem_type = WMFW_ADSP2_YM, - .base_offset = HOST_BUFFER_FIELD(Y_buf_base), - .size_offset = HOST_BUFFER_FIELD(wrap), + .base_offset = HOST_BUFFER_FIELD(buf3_base), + .size_offset = HOST_BUFFER_FIELD(buf_total_size), }, };