From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C582C433EF for ; Mon, 22 Nov 2021 18:38:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240378AbhKVSmB (ORCPT ); Mon, 22 Nov 2021 13:42:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235182AbhKVSl4 (ORCPT ); Mon, 22 Nov 2021 13:41:56 -0500 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8F65C061574; Mon, 22 Nov 2021 10:38:49 -0800 (PST) Received: by mail-ot1-x333.google.com with SMTP id h16-20020a9d7990000000b0055c7ae44dd2so30098740otm.10; Mon, 22 Nov 2021 10:38:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=UHFB4okDolhXrN2KtXNKGXY4xx9A6ENlJZJpcpYJSa4=; b=iF32sjGrzSvaDDiDrzm4Jn8+gNbGxPrbBxZFxi4uCknK7CkuUHGcqoOD65h4RyWxyF y+wOmbGDPKkCG8jIqPGxKaFK0D3GvGCi7E7vj/rSSTElZKQ4I+sO6sAsXlhvWm4LJdnp 2KvDVCusXICAOU/8p8E70quXduhRoLziMS5wtCLJdF0xE54KuxD1Hx/LXZJoPAM3DNL1 BkvRF4pmS6od3lYRUbwlZMx97PcjFnI9HdmkEczPsl3ta8bzsAye+LybTN6gfUn7gNW8 MLS92ARh+GguAjdL9uq+LetI8B96GaD9Vc3Ip4BN7Uy3BSXQIu3jgX7O1p5U0Obaav48 V51g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :subject:content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=UHFB4okDolhXrN2KtXNKGXY4xx9A6ENlJZJpcpYJSa4=; b=wI6BKtLTjV71b36AuQa7eqeNpGoXyn1KTwsO+7skapVw+pmDbPKZmEh5H0sXecgQnt yzJKt3KdhxBEAKbKcI8rSlhhEm/A4oZHuvvRZaObwtKQzlgvzMPHfGguy9imT/JcpjPs I6XIlPCY8ETNjuOdWot9trq43v/2ZY4ki8uYzXC+qzEIgRO0AFRzV9hHjtkPA78ksFXK futpmcQkacgTtsGbQt1gOephKyFO0eOGBW2j8cC8cild9soZ8YMcmBNn4Zk3rn1SOaxP uPb25fsRYJ9hB3FsWqlRBxnxq6tUXiZRFaIAozbkbuoe0thxa6DODfQT+PD3xGAzWfQp V3fw== X-Gm-Message-State: AOAM532lDdsUO3aNW37ss9kreDysmNYReVetgXnabQmUDkyYTfjx1cCb yq2KAvvSNAzYtPgE/p1uNDk= X-Google-Smtp-Source: ABdhPJwfr5gWpFAYZtUOP0l+WeTUOCLuMHjoxvBl19lgRYsYRNjGQbRkBWj0P0bUDebnG/bzTCmu0Q== X-Received: by 2002:a9d:5190:: with SMTP id y16mr27309322otg.364.1637606329228; Mon, 22 Nov 2021 10:38:49 -0800 (PST) Received: from [10.62.118.101] (cpe-24-31-246-181.kc.res.rr.com. [24.31.246.181]) by smtp.gmail.com with ESMTPSA id f18sm1729016otl.28.2021.11.22.10.38.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Nov 2021 10:38:48 -0800 (PST) Sender: Larry Finger Message-ID: Date: Mon, 22 Nov 2021 12:38:41 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [PATCH/RFC 17/17] rtw89: Use bitfield helpers Content-Language: en-US To: Geert Uytterhoeven , Tony Lindgren , Russell King , Rajendra Nayak , Paul Walmsley , Michael Turquette , Stephen Boyd , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , Tero Kristo , Jonathan Cameron , Lars-Peter Clausen , Lorenzo Bianconi , Benoit Parrot , Mauro Carvalho Chehab , Adrian Hunter , Andrew Jeffery , Ulf Hansson , Joel Stanley , Ping-Ke Shih , Kalle Valo , "David S . Miller" , Jakub Kicinski , Linus Walleij , Liam Girdwood , Mark Brown , Magnus Damm , Eduardo Valentin , Keerthy , "Rafael J . Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Jaroslav Kysela , Takashi Iwai Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-iio@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-gpio@vger.kernel.org, linux-pm@vger.kernel.org, alsa-devel@alsa-project.org References: From: Larry Finger In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 11/22/21 09:54, Geert Uytterhoeven wrote: > Use the field_{get,prep}() helpers, instead of open-coding the same > operations. > > Signed-off-by: Geert Uytterhoeven > --- > Compile-tested only. > Marked RFC, as this depends on [PATCH 01/17], but follows a different > path to upstream. > --- > drivers/net/wireless/realtek/rtw89/core.h | 38 ++++------------------- > 1 file changed, 6 insertions(+), 32 deletions(-) Tested-by: Larry Finger Larry > > diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h > index c2885e4dd882f045..f9c0300ec373aaf2 100644 > --- a/drivers/net/wireless/realtek/rtw89/core.h > +++ b/drivers/net/wireless/realtek/rtw89/core.h > @@ -2994,81 +2994,55 @@ rtw89_write32_clr(struct rtw89_dev *rtwdev, u32 addr, u32 bit) > static inline u32 > rtw89_read32_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask) > { > - u32 shift = __ffs(mask); > - u32 orig; > - u32 ret; > - > - orig = rtw89_read32(rtwdev, addr); > - ret = (orig & mask) >> shift; > - > - return ret; > + return field_get(mask, rtw89_read32(rtwdev, addr)); > } > > static inline u16 > rtw89_read16_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask) > { > - u32 shift = __ffs(mask); > - u32 orig; > - u32 ret; > - > - orig = rtw89_read16(rtwdev, addr); > - ret = (orig & mask) >> shift; > - > - return ret; > + return field_get(mask, rtw89_read16(rtwdev, addr)); > } > > static inline u8 > rtw89_read8_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask) > { > - u32 shift = __ffs(mask); > - u32 orig; > - u32 ret; > - > - orig = rtw89_read8(rtwdev, addr); > - ret = (orig & mask) >> shift; > - > - return ret; > + return field_get(mask, rtw89_read8(rtwdev, addr)); > } > > static inline void > rtw89_write32_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u32 data) > { > - u32 shift = __ffs(mask); > u32 orig; > u32 set; > > WARN(addr & 0x3, "should be 4-byte aligned, addr = 0x%08x\n", addr); > > orig = rtw89_read32(rtwdev, addr); > - set = (orig & ~mask) | ((data << shift) & mask); > + set = (orig & ~mask) | field_prep(mask, data); > rtw89_write32(rtwdev, addr, set); > } > > static inline void > rtw89_write16_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u16 data) > { > - u32 shift; > u16 orig, set; > > mask &= 0xffff; > - shift = __ffs(mask); > > orig = rtw89_read16(rtwdev, addr); > - set = (orig & ~mask) | ((data << shift) & mask); > + set = (orig & ~mask) | field_prep(mask, data); > rtw89_write16(rtwdev, addr, set); > } > > static inline void > rtw89_write8_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u8 data) > { > - u32 shift; > u8 orig, set; > > mask &= 0xff; > - shift = __ffs(mask); > > orig = rtw89_read8(rtwdev, addr); > - set = (orig & ~mask) | ((data << shift) & mask); > + set = (orig & ~mask) | field_prep(mask, data); > rtw89_write8(rtwdev, addr, set); > } > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6428EC433F5 for ; Tue, 23 Nov 2021 08:33:29 +0000 (UTC) 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 7739816EC; Tue, 23 Nov 2021 09:32:37 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7739816EC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1637656407; bh=ztIIYU3zzXT+BNVkVntbs7tP28S0TalcmnSmCNdo0gU=; h=Date:Subject:To:References:From:In-Reply-To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=oMdzrfgQ0eiPSIpfmskhjktLx5Tt+XbXLyZREuJ44GYR3rEGOBOS7rgQCkg1aGD5r CN5CMrFF+KUq/TqkptJadcdreEDNjYQfV3mFsdWutFRwC7vnIYI9Q+F3BkDhHw3hwJ 51WiXKX++P6e2SXFU5d5heOiNbuRqTZKwZHC54bM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1D717F805F5; Tue, 23 Nov 2021 09:22:17 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A04D6F80212; Mon, 22 Nov 2021 19:38:58 +0100 (CET) Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 366C1F800E7 for ; Mon, 22 Nov 2021 19:38:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 366C1F800E7 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iF32sjGr" Received: by mail-ot1-x32c.google.com with SMTP id x43-20020a056830246b00b00570d09d34ebso30164557otr.2 for ; Mon, 22 Nov 2021 10:38:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=UHFB4okDolhXrN2KtXNKGXY4xx9A6ENlJZJpcpYJSa4=; b=iF32sjGrzSvaDDiDrzm4Jn8+gNbGxPrbBxZFxi4uCknK7CkuUHGcqoOD65h4RyWxyF y+wOmbGDPKkCG8jIqPGxKaFK0D3GvGCi7E7vj/rSSTElZKQ4I+sO6sAsXlhvWm4LJdnp 2KvDVCusXICAOU/8p8E70quXduhRoLziMS5wtCLJdF0xE54KuxD1Hx/LXZJoPAM3DNL1 BkvRF4pmS6od3lYRUbwlZMx97PcjFnI9HdmkEczPsl3ta8bzsAye+LybTN6gfUn7gNW8 MLS92ARh+GguAjdL9uq+LetI8B96GaD9Vc3Ip4BN7Uy3BSXQIu3jgX7O1p5U0Obaav48 V51g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :subject:content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=UHFB4okDolhXrN2KtXNKGXY4xx9A6ENlJZJpcpYJSa4=; b=rYnXS9h8VqbgGGHTY3LpaZKUm/yvooEdx2ac90ZZSosOG82XdnilVST/ypieWFotxa dahYPqWtkyf4vjtPfcJylv43SLkbUTnIaa7ZbXWvo++xaCsAs9w3zHY/nXSkf/Bz4yLY vsGi24Ge2w070uZY6pf0Cz98cBMZV7MrxfYFpGRCXU/2wKoe7NLPB392/m/XqCY03MYI JzPq/JUWfRtK9KesPCD9VNcR5/YuJ91izIIevJhjfxF9uMKVRFgY4DGELFeci+94E4/+ 8gMz33cg7MCGSjvorkKjcoK7sdWAJo9BAArsiVVL3LbYGn2SYMfIvOEMedUS2VYcHf8P pVWw== X-Gm-Message-State: AOAM531FIXq1sKNWH4Z5uKiaeXhilaVdzrYYnbyoQLt9INPId9QzpLqN xPFlqqnQDfsqB+8SYkM9SpM= X-Google-Smtp-Source: ABdhPJwfr5gWpFAYZtUOP0l+WeTUOCLuMHjoxvBl19lgRYsYRNjGQbRkBWj0P0bUDebnG/bzTCmu0Q== X-Received: by 2002:a9d:5190:: with SMTP id y16mr27309322otg.364.1637606329228; Mon, 22 Nov 2021 10:38:49 -0800 (PST) Received: from [10.62.118.101] (cpe-24-31-246-181.kc.res.rr.com. [24.31.246.181]) by smtp.gmail.com with ESMTPSA id f18sm1729016otl.28.2021.11.22.10.38.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Nov 2021 10:38:48 -0800 (PST) Message-ID: Date: Mon, 22 Nov 2021 12:38:41 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [PATCH/RFC 17/17] rtw89: Use bitfield helpers Content-Language: en-US To: Geert Uytterhoeven , Tony Lindgren , Russell King , Rajendra Nayak , Paul Walmsley , Michael Turquette , Stephen Boyd , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , Tero Kristo , Jonathan Cameron , Lars-Peter Clausen , Lorenzo Bianconi , Benoit Parrot , Mauro Carvalho Chehab , Adrian Hunter , Andrew Jeffery , Ulf Hansson , Joel Stanley , Ping-Ke Shih , Kalle Valo , "David S . Miller" , Jakub Kicinski , Linus Walleij , Liam Girdwood , Mark Brown , Magnus Damm , Eduardo Valentin , Keerthy , "Rafael J . Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Jaroslav Kysela , Takashi Iwai References: From: Larry Finger In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Tue, 23 Nov 2021 09:20:58 +0100 Cc: alsa-devel@alsa-project.org, linux-aspeed@lists.ozlabs.org, linux-pm@vger.kernel.org, linux-iio@vger.kernel.org, linux-wireless@vger.kernel.org, openbmc@lists.ozlabs.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org 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 11/22/21 09:54, Geert Uytterhoeven wrote: > Use the field_{get,prep}() helpers, instead of open-coding the same > operations. > > Signed-off-by: Geert Uytterhoeven > --- > Compile-tested only. > Marked RFC, as this depends on [PATCH 01/17], but follows a different > path to upstream. > --- > drivers/net/wireless/realtek/rtw89/core.h | 38 ++++------------------- > 1 file changed, 6 insertions(+), 32 deletions(-) Tested-by: Larry Finger Larry > > diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h > index c2885e4dd882f045..f9c0300ec373aaf2 100644 > --- a/drivers/net/wireless/realtek/rtw89/core.h > +++ b/drivers/net/wireless/realtek/rtw89/core.h > @@ -2994,81 +2994,55 @@ rtw89_write32_clr(struct rtw89_dev *rtwdev, u32 addr, u32 bit) > static inline u32 > rtw89_read32_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask) > { > - u32 shift = __ffs(mask); > - u32 orig; > - u32 ret; > - > - orig = rtw89_read32(rtwdev, addr); > - ret = (orig & mask) >> shift; > - > - return ret; > + return field_get(mask, rtw89_read32(rtwdev, addr)); > } > > static inline u16 > rtw89_read16_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask) > { > - u32 shift = __ffs(mask); > - u32 orig; > - u32 ret; > - > - orig = rtw89_read16(rtwdev, addr); > - ret = (orig & mask) >> shift; > - > - return ret; > + return field_get(mask, rtw89_read16(rtwdev, addr)); > } > > static inline u8 > rtw89_read8_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask) > { > - u32 shift = __ffs(mask); > - u32 orig; > - u32 ret; > - > - orig = rtw89_read8(rtwdev, addr); > - ret = (orig & mask) >> shift; > - > - return ret; > + return field_get(mask, rtw89_read8(rtwdev, addr)); > } > > static inline void > rtw89_write32_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u32 data) > { > - u32 shift = __ffs(mask); > u32 orig; > u32 set; > > WARN(addr & 0x3, "should be 4-byte aligned, addr = 0x%08x\n", addr); > > orig = rtw89_read32(rtwdev, addr); > - set = (orig & ~mask) | ((data << shift) & mask); > + set = (orig & ~mask) | field_prep(mask, data); > rtw89_write32(rtwdev, addr, set); > } > > static inline void > rtw89_write16_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u16 data) > { > - u32 shift; > u16 orig, set; > > mask &= 0xffff; > - shift = __ffs(mask); > > orig = rtw89_read16(rtwdev, addr); > - set = (orig & ~mask) | ((data << shift) & mask); > + set = (orig & ~mask) | field_prep(mask, data); > rtw89_write16(rtwdev, addr, set); > } > > static inline void > rtw89_write8_mask(struct rtw89_dev *rtwdev, u32 addr, u32 mask, u8 data) > { > - u32 shift; > u8 orig, set; > > mask &= 0xff; > - shift = __ffs(mask); > > orig = rtw89_read8(rtwdev, addr); > - set = (orig & ~mask) | ((data << shift) & mask); > + set = (orig & ~mask) | field_prep(mask, data); > rtw89_write8(rtwdev, addr, set); > } > >