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 7D57CC4363D for ; Thu, 24 Sep 2020 14:25:26 +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 7459A2220C for ; Thu, 24 Sep 2020 14:25:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="jFWo2851" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7459A2220C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 75C4A17CB; Thu, 24 Sep 2020 16:24:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 75C4A17CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1600957522; bh=YTXnK4BitMV1ehQ0Qs1Qo/2zP4g5+nRPrtPLOCta5+I=; h=Date:From:To:Subject:References:In-Reply-To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=jFWo28510ITB8sJTcih4H4A3KoyuTbEnPUDaWgzhrwz+ysc8vZwU/QPPm/A93MlPL JBQM7R1OY9u9OINEIQu1r9Gh4GrD88lVp5g4TQhrmt/B2M+9dZ4l3tB7rrKyTEHMFV DEwA7nsqBeNW+920IMqpwbzY5bUhKpKZNJbi+bEg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 061A6F800B4; Thu, 24 Sep 2020 16:24:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D07ACF80232; Thu, 24 Sep 2020 16:24:29 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 EFD89F800B4 for ; Thu, 24 Sep 2020 16:24:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EFD89F800B4 IronPort-SDR: TJ/I0kgtlRtYDTjGJh48g71hPDMItUPx31aaamBMMGjbdRQq88JaaIHjv9mg/beQDbu4WiAQsf Gvo6qhzxsbMg== X-IronPort-AV: E=McAfee;i="6000,8403,9753"; a="158575870" X-IronPort-AV: E=Sophos;i="5.77,298,1596524400"; d="scan'208";a="158575870" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2020 07:24:20 -0700 IronPort-SDR: EKTYQ8sVaj3qOLpvXNcbPpFCzw2ArjNQheClZkpubgmC/nlert+s+tIb8Cd6/AVeWcV2Qb7JGV Xvs9emm1Z2Vw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,298,1596524400"; d="scan'208";a="339064694" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by orsmga008.jf.intel.com with ESMTP; 24 Sep 2020 07:24:16 -0700 Received: from andy by smile with local (Exim 4.94) (envelope-from ) id 1kLS8H-001gis-TP; Thu, 24 Sep 2020 17:22:01 +0300 Date: Thu, 24 Sep 2020 17:22:01 +0300 From: Andy Shevchenko To: "Rojewski, Cezary" Subject: Re: [PATCH v8 06/14] ASoC: Intel: catpt: PCM operations Message-ID: <20200924142201.GU3956970@smile.fi.intel.com> References: <20200923122508.3360-1-cezary.rojewski@intel.com> <20200923122508.3360-7-cezary.rojewski@intel.com> <20200923135422.GM3956970@smile.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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 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 topology > >> 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 DUAL 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. Nothing wrong with stereo. What I'm talking about is to move DUAL MONO from below to here because it looks more logical to have sequence by increasing amount of channels in use. > >> + 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[] = { > >> + 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.. Because it's simply not needed. I specifically asked about gaps, now I don't see any possible justification why to keep the table. What are the benefits? > >> +static u32 ctlvol_to_dspvol(u32 value) > >> +{ > >> + if (value >= ARRAY_SIZE(volume_map)) > >> + value = 0; > >> + return volume_map[value]; > > > > if (value > 30) > > value = 0; > > return DSP_VOLUME_MAX >> (30 - value); > > I suppose 'DSP_VOLUME_STEP_MAX 30' is to be defined right next to > DSP_VOLUME_MAX. Yes. > 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. > >> +} > >> + > >> +static u32 dspvol_to_ctlvol(u32 volume) > >> +{ > >> + int i; > >> + > >> + for (i = 0; i < ARRAY_SIZE(volume_map); i++) > >> + if (volume_map[i] >= 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; No, I meant fls() due to defined respond to 0 value. But maybe __fls() works better in this case. -- With Best Regards, Andy Shevchenko