Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFF94C2D0A8 for ; Sat, 26 Sep 2020 08:53:41 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 8CB4021D82 for ; Sat, 26 Sep 2020 08:53:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="m8FFb3ck" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8CB4021D82 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org 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 9770B18BE; Sat, 26 Sep 2020 10:52:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9770B18BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1601110418; bh=hEuTJSk6ewsUDdb9hn31vzy/7GcABS0d/uGoWc+m6tQ=; h=From:To:Subject:Date:References:In-Reply-To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=m8FFb3ckkZGHS4S6E9hVA8IX6AvVKbdNiBeT6s4YEHeHKyPlRdJsZPoVBKEm0klKp v1P5wPvZE/4E5ueziuCjBV5+PVtwv4bCNdzAJPhQi1l8PSkkn8DjNCe2gTXOP+HMq+ gvqlpGMTPMSpAlb2ik2tJ7RB+ZhqC6QqkqUxoHY8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A3DFEF80229; Sat, 26 Sep 2020 10:52:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 50CF0F80232; Sat, 26 Sep 2020 10:52:46 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 E9614F80162 for ; Sat, 26 Sep 2020 10:52:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E9614F80162 IronPort-SDR: Hdp+JM8UMi9c53QU8J2Ns2H8rl8IzKiewtfainUX0kmY5K2spPU43DRD5A/0zDEHNdVef54/Wl SDz1m/5V/+vg== X-IronPort-AV: E=McAfee;i="6000,8403,9755"; a="149388916" X-IronPort-AV: E=Sophos;i="5.77,305,1596524400"; d="scan'208";a="149388916" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2020 01:52:35 -0700 IronPort-SDR: cImhc46IJrfn8yrTULuxt4rI1CtOzPVfcukjLQR1wUmXy8zZxCCZ4ANfHj0w1R3YgCuNtaMvTn 78fBmtJXAugQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,305,1596524400"; d="scan'208";a="337313313" Received: from irsmsx606.ger.corp.intel.com ([163.33.146.139]) by fmsmga004.fm.intel.com with ESMTP; 26 Sep 2020 01:52:33 -0700 Received: from irsmsx601.ger.corp.intel.com (163.33.146.7) by IRSMSX606.ger.corp.intel.com (163.33.146.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sat, 26 Sep 2020 09:52:32 +0100 Received: from irsmsx601.ger.corp.intel.com ([163.33.146.7]) by irsmsx601.ger.corp.intel.com ([163.33.146.7]) with mapi id 15.01.1713.004; Sat, 26 Sep 2020 09:52:32 +0100 From: "Rojewski, Cezary" To: Andy Shevchenko Subject: RE: [PATCH v8 06/14] ASoC: Intel: catpt: PCM operations Thread-Topic: [PATCH v8 06/14] ASoC: Intel: catpt: PCM operations Thread-Index: AQHWkaS+5APyIDnUPUWmt/ijNOLtz6l2LgcAgABaW+CAAT+zgIAC2MUg Date: Sat, 26 Sep 2020 08:52:32 +0000 Message-ID: References: <20200923122508.3360-1-cezary.rojewski@intel.com> <20200923122508.3360-7-cezary.rojewski@intel.com> <20200923135422.GM3956970@smile.fi.intel.com> <20200924142201.GU3956970@smile.fi.intel.com> In-Reply-To: <20200924142201.GU3956970@smile.fi.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [163.33.253.164] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: "pierre-louis.bossart@linux.intel.com" , "alsa-devel@alsa-project.org" , "Kaczmarski, Filip" , "N, Harshapriya" , "gregkh@linuxfoundation.org" , "Barlik, Marcin" , "zwisler@google.com" , "lgirdwood@gmail.com" , "tiwai@suse.com" , "Proborszcz, Filip" , "broonie@kernel.org" , "amadeuszx.slawinski@linux.intel.com" , "Wasko, Michal" , "cujomalainey@chromium.org" , "Hejmowski, Krzysztof" , "ppapierkowski@habana.ai" , "Gopal, Vamshi Krishna" 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" On 2020-09-24 4:22 PM, Andy Shevchenko wrote: > On Wed, Sep 23, 2020 at 06:23:22PM +0000, Rojewski, Cezary wrote: >> On 2020-09-23 3:54 PM, Andy Shevchenko wrote: >>> On Wed, Sep 23, 2020 at 02:25:00PM +0200, Cezary Rojewski wrote: >>>> DSP designed for Lynxpoint and Wildcat Point offers no dynamic topolog= y >>>> i.e. all pipelines are already defined within firmware and host is >>>> relegated to allocing stream for predefined pins. This is represented = by >>>> 'catpt_topology' member. ... >>>> +static u32 catpt_get_channel_map(enum catpt_channel_config config) >>>> +{ >>>> + switch (config) { >>>> + case CATPT_CHANNEL_CONFIG_MONO: >>>> + return (GENMASK(31, 4) | CATPT_CHANNEL_CENTER); >>> >>> In all cases outer parentheses are not needed. Also I expected to see D= UAL MONO >>> case here, rather than below. >>> >> >> Ack for the parentheses but what's wrong with the sweet '_STEREO' name? >> This function is based on internal equivalent. As I aim to ease any >> further debug/development by aligning with Windows equivalent, name >> changes for no real reason do not help with that goal. >> >> If I'm missing something about 'DUAL MONO', feel free to correct me. >=20 > Nothing wrong with stereo. What I'm talking about is to move DUAL MONO fr= om below to here because it looks more logical to have sequence by increasi= ng amount of channels in use. >=20 _DUAL_MONO is so far below that even I - who is very familiar with the catpt's code : ) - forgotten about it. Relocating below _MONO as suggested. >>>> + case CATPT_CHANNEL_CONFIG_STEREO: >>>> + return (GENMASK(31, 8) | CATPT_CHANNEL_LEFT >>>> + | (CATPT_CHANNEL_RIGHT << 4)); >>>> + >>>> + case CATPT_CHANNEL_CONFIG_2_POINT_1: >>>> + return (GENMASK(31, 12) | CATPT_CHANNEL_LEFT >>>> + | (CATPT_CHANNEL_RIGHT << 4) >>>> + | (CATPT_CHANNEL_LFE << 8)); >>>> + >>>> + case CATPT_CHANNEL_CONFIG_3_POINT_0: >>>> + return (GENMASK(31, 12) | CATPT_CHANNEL_LEFT >>>> + | (CATPT_CHANNEL_CENTER << 4) >>>> + | (CATPT_CHANNEL_RIGHT << 8)); >>>> + >>>> + case CATPT_CHANNEL_CONFIG_3_POINT_1: >>>> + return (GENMASK(31, 16) | CATPT_CHANNEL_LEFT >>>> + | (CATPT_CHANNEL_CENTER << 4) >>>> + | (CATPT_CHANNEL_RIGHT << 8) >>>> + | (CATPT_CHANNEL_LFE << 12)); >>>> + >>>> + case CATPT_CHANNEL_CONFIG_QUATRO: >>>> + return (GENMASK(31, 16) | CATPT_CHANNEL_LEFT >>>> + | (CATPT_CHANNEL_RIGHT << 4) >>>> + | (CATPT_CHANNEL_LEFT_SURROUND << 8) >>>> + | (CATPT_CHANNEL_RIGHT_SURROUND << 12)); >>>> + >>>> + case CATPT_CHANNEL_CONFIG_4_POINT_0: >>>> + return (GENMASK(31, 16) | CATPT_CHANNEL_LEFT >>>> + | (CATPT_CHANNEL_CENTER << 4) >>>> + | (CATPT_CHANNEL_RIGHT << 8) >>>> + | (CATPT_CHANNEL_CENTER_SURROUND << 12)); >>>> + >>>> + case CATPT_CHANNEL_CONFIG_5_POINT_0: >>>> + return (GENMASK(31, 20) | CATPT_CHANNEL_LEFT >>>> + | (CATPT_CHANNEL_CENTER << 4) >>>> + | (CATPT_CHANNEL_RIGHT << 8) >>>> + | (CATPT_CHANNEL_LEFT_SURROUND << 12) >>>> + | (CATPT_CHANNEL_RIGHT_SURROUND << 16)); >>>> + >>>> + case CATPT_CHANNEL_CONFIG_5_POINT_1: >>>> + return (GENMASK(31, 24) | CATPT_CHANNEL_CENTER >>>> + | (CATPT_CHANNEL_LEFT << 4) >>>> + | (CATPT_CHANNEL_RIGHT << 8) >>>> + | (CATPT_CHANNEL_LEFT_SURROUND << 12) >>>> + | (CATPT_CHANNEL_RIGHT_SURROUND << 16) >>>> + | (CATPT_CHANNEL_LFE << 20)); >>>> + >>>> + case CATPT_CHANNEL_CONFIG_DUAL_MONO: >>>> + return (GENMASK(31, 8) | CATPT_CHANNEL_LEFT >>>> + | (CATPT_CHANNEL_LEFT << 4)); >>>> + >>>> + default: >>>> + return U32_MAX; >>>> + } >>>> +} >>>> + ... >>>> +#define DSP_VOLUME_MAX S32_MAX /* 0db */ >>> >>>> +static const u32 volume_map[] =3D { >>>> + DSP_VOLUME_MAX >> 30, >>>> + DSP_VOLUME_MAX >> 29, >>>> + DSP_VOLUME_MAX >> 28, >>>> + DSP_VOLUME_MAX >> 27, >>>> + DSP_VOLUME_MAX >> 26, >>>> + DSP_VOLUME_MAX >> 25, >>>> + DSP_VOLUME_MAX >> 24, >>>> + DSP_VOLUME_MAX >> 23, >>>> + DSP_VOLUME_MAX >> 22, >>>> + DSP_VOLUME_MAX >> 21, >>>> + DSP_VOLUME_MAX >> 20, >>>> + DSP_VOLUME_MAX >> 19, >>>> + DSP_VOLUME_MAX >> 18, >>>> + DSP_VOLUME_MAX >> 17, >>>> + DSP_VOLUME_MAX >> 16, >>>> + DSP_VOLUME_MAX >> 15, >>>> + DSP_VOLUME_MAX >> 14, >>>> + DSP_VOLUME_MAX >> 13, >>>> + DSP_VOLUME_MAX >> 12, >>>> + DSP_VOLUME_MAX >> 11, >>>> + DSP_VOLUME_MAX >> 10, >>>> + DSP_VOLUME_MAX >> 9, >>>> + DSP_VOLUME_MAX >> 8, >>>> + DSP_VOLUME_MAX >> 7, >>>> + DSP_VOLUME_MAX >> 6, >>>> + DSP_VOLUME_MAX >> 5, >>>> + DSP_VOLUME_MAX >> 4, >>>> + DSP_VOLUME_MAX >> 3, >>>> + DSP_VOLUME_MAX >> 2, >>>> + DSP_VOLUME_MAX >> 1, >>>> + DSP_VOLUME_MAX >> 0, >>>> +}; >>> >>> Why not to get rid of this table completely? >>> >> >> I don't see anything wrong with this lookup table. If you insist I can >> get rid of it - that's the last piece of /haswell/ that survived the >> "cleanup" afterall.. >=20 > Because it's simply not needed. I specifically asked about gaps, now I do= n't > see any possible justification why to keep the table. What are the benefi= ts? >=20 volume_map no longer with us in v9, thanks. >>>> +static u32 ctlvol_to_dspvol(u32 value) >>>> +{ >>>> + if (value >=3D ARRAY_SIZE(volume_map)) >>>> + value =3D 0; >>>> + return volume_map[value]; >>> >>> if (value > 30) >>> value =3D 0; >>> return DSP_VOLUME_MAX >> (30 - value); >> >> I suppose 'DSP_VOLUME_STEP_MAX 30' is to be defined right next to >> DSP_VOLUME_MAX. >=20 > Yes. >=20 >> As I said in earlier responses, please note size of this table is >> helpful when assigning kcontrol info in catpt_volume_info(). Macro will >> take its place then. >=20 >>>> +} >>>> + >>>> +static u32 dspvol_to_ctlvol(u32 volume) >>>> +{ >>>> + int i; >>>> + >>>> + for (i =3D 0; i < ARRAY_SIZE(volume_map); i++) >>>> + if (volume_map[i] >=3D volume) >>>> + return i; >>>> + return i - 1; >>> >>> fls() ? >>> >> >> Well, fls(DSP_VOLUME_MAX) yields 31 which is inappropriate for >> kcontrol with value range: 0-30. >> >> Guess you meant: __fls(). Following is the implementation (accounting >> for edge cases): >> if (volume > DSP_VOLUME_MAX) >> return DSP_VOLUME_STEP_MAX; >> return volume ? __fls(volume) : 0; >=20 > No, I meant fls() due to defined respond to 0 value. > But maybe __fls() works better in this case. >=20 __fls() is the method of choice in v9 for reasons above. Thanks, Czarek