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=-12.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 E03EAC433E2 for ; Fri, 28 Aug 2020 18:14:18 +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 6D16E20936 for ; Fri, 28 Aug 2020 18:14:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="nmd+7rOA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D16E20936 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 D757418C0; Fri, 28 Aug 2020 20:13:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D757418C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1598638456; bh=jxjeNC0L6dsMcwkB9W9BkkGzbsVq25srNSCFjfPo4ks=; h=Subject:To:References:From:Date:In-Reply-To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=nmd+7rOAqYsg+N6IVfihpeI40MuFeNIidtGYhC4azD04VCO2GKx/Eu8E6mM51k3CX KQiD9PoAnSoEXtRY7UfNtuTAWxhX1L9u3fqxKg3EBDnVs3h8/wkCHTdr8sQDA7re3j cL1VHaw3di7PcBUNXt/qIMhIrYf2iYJRXjm9SGsc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6190DF80143; Fri, 28 Aug 2020 20:13:26 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CBB6EF8016F; Fri, 28 Aug 2020 20:13:24 +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 33F1BF80118 for ; Fri, 28 Aug 2020 20:13:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 33F1BF80118 IronPort-SDR: Gd4TLCpgSCzTtb6Bx2km6PyLYkgDgCyslMELR/33nm92O6EcHDsYmMTVaLIlVHl+AyD7Ck6CwY fgGUzf0BXGVw== X-IronPort-AV: E=McAfee;i="6000,8403,9727"; a="144471822" X-IronPort-AV: E=Sophos;i="5.76,364,1592895600"; d="scan'208,223";a="144471822" X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2020 11:13:11 -0700 IronPort-SDR: 8gZh9oTgfl1jVz7HT9mFfM6RJBaLdOau+1SK1bBIpKdyTlyR+hxby8YgxhSa8Gotykk5dr/tA5 tUgfB9ifPYjg== X-IronPort-AV: E=Sophos;i="5.76,364,1592895600"; d="scan'208,223";a="444916958" Received: from vjmendox-mobl2.amr.corp.intel.com (HELO [10.209.50.200]) ([10.209.50.200]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2020 11:13:10 -0700 Subject: Re: [PATCH 6/9] soundwire: cadence: use FIELD_{GET|PREP} To: Vinod Koul , alsa-devel@alsa-project.org References: <20200828072101.3781956-1-vkoul@kernel.org> <20200828072101.3781956-7-vkoul@kernel.org> From: Pierre-Louis Bossart Message-ID: Date: Fri, 28 Aug 2020 13:13:09 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200828072101.3781956-7-vkoul@kernel.org> Content-Type: multipart/mixed; boundary="------------44F4D67F7C009627DC90AE30" Content-Language: en-US Cc: Bard Liao , Sanyog Kale , Srinivas Kandagatla 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" This is a multi-part message in MIME format. --------------44F4D67F7C009627DC90AE30 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit > - val = (r << CDNS_MCP_FRAME_SHAPE_ROW_OFFSET) | c; > + val = FIELD_PREP(CDNS_MCP_FRAME_SHAPE_ROW_OFFSET, r) | c; Confusion between shift and mask here. Testing a fix now (attached), but may I suggest you use the SOF GitHub/Travis CI directly for any updates? You'll get an answer in 30mn for the CML RVP w/ SoundWire. --------------44F4D67F7C009627DC90AE30 Content-Type: text/x-patch; charset=UTF-8; name="0001-fixup-soundwire-cadence-use-FIELD_-GET-PREP.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-fixup-soundwire-cadence-use-FIELD_-GET-PREP.patch" From 5d0ca63bee2c6e2456195499908ecdc8a7709238 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Fri, 28 Aug 2020 13:04:01 -0500 Subject: [PATCH] fixup! soundwire: cadence: use FIELD_{GET|PREP} Fix confusion between shift and mask. Signed-off-by: Pierre-Louis Bossart --- drivers/soundwire/cadence_master.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index b6796aa19aa8..5dd06483c835 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -58,7 +58,7 @@ MODULE_PARM_DESC(cdns_mcp_int_mask, "Cadence MCP IntMask"); #define CDNS_MCP_FRAME_SHAPE 0x10 #define CDNS_MCP_FRAME_SHAPE_INIT 0x14 #define CDNS_MCP_FRAME_SHAPE_COL_MASK GENMASK(2, 0) -#define CDNS_MCP_FRAME_SHAPE_ROW_OFFSET 3 +#define CDNS_MCP_FRAME_SHAPE_ROW_MASK GENMASK(7, 3) #define CDNS_MCP_CONFIG_UPDATE 0x18 #define CDNS_MCP_CONFIG_UPDATE_BIT BIT(0) @@ -1165,9 +1165,10 @@ static u32 cdns_set_initial_frame_shape(int n_rows, int n_cols) int r; r = sdw_find_row_index(n_rows); - c = sdw_find_col_index(n_cols) & CDNS_MCP_FRAME_SHAPE_COL_MASK; + c = sdw_find_col_index(n_cols); - val = FIELD_PREP(CDNS_MCP_FRAME_SHAPE_ROW_OFFSET, r) | c; + val = FIELD_PREP(CDNS_MCP_FRAME_SHAPE_ROW_MASK, r) | + FIELD_PREP(CDNS_MCP_FRAME_SHAPE_COL_MASK, c); return val; } -- 2.25.1 --------------44F4D67F7C009627DC90AE30--