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 BC6A0C4332F for ; Tue, 14 Dec 2021 22:44:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235000AbhLNWog (ORCPT ); Tue, 14 Dec 2021 17:44:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234573AbhLNWo2 (ORCPT ); Tue, 14 Dec 2021 17:44:28 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5084CC061747; Tue, 14 Dec 2021 14:44:28 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id z9so13310385edb.5; Tue, 14 Dec 2021 14:44:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FPHCW224dbQX+hfHQkJaGaEhoEvlqsOfdITuUUKo/eY=; b=iQonsgNdyXWXKzPgB6sLOQvOktwGJFwXKqY+7JNW96plQoL4G7lFr33gEUyX+Joa1W keB7iCvbaztjl25PJMdAB5OkfpF/RPIrfLhQwf6nvpZQqVFYQDB9EGj8hNy1Wt1vvJjj vs8hFJd63mkx+6FXpHBNqJfzfYvxwmeBt6dA6scXiWEKiTn5vk8JVr5iBuWNWpwuUO6a WHbWdA8yNvaywkzTqqBThVbVsk72bqzHqfVLeqjIrhgKDMsaat0WlRHGC/hLId5ZufvM nDPl7foYLBjWIikKv1U9KBsr4Yj8fT1nT8DJvBRgyUbtnhXyTwf94UMITblUbnaTKcCV eJLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FPHCW224dbQX+hfHQkJaGaEhoEvlqsOfdITuUUKo/eY=; b=MlIuSyeG7PSd1bv4Lh9jOGXIQCUuutSv6lKxdy2Vo++/RQIQ9rNYaOju3+vS2R+d+Z FXKGyEwmLkOTdCx4u40bT0jbz73V3WuGWBCqcuZarQO7C1/WxGwH7ji1t26nnzqZCC5j b3GTk19kru4iZFtdGBvaazzUH1HjnuLo2/HGmNn+RILw19LRjoAzvEy5siE68oEPyXrc JVLwO4DzyMVXs/h7w1hjFSsxLJ+sJzeo5wOcfKABvwERnlXbO3vZFwOPjIUa+G3fAsWx MNDhEpmGF/XJIpLWkujyLgdG2zy+0NGBskZQ84Gz+6I/t+jikrUKPJMIvP/e8VdVrUOD D3pA== X-Gm-Message-State: AOAM53174VFSfpzinKnsHyBy7Bl98Y22cNKunUFEU6K5IycGC+eHFAUk ywp2bk1tGKR+b7gX21vYZU4TGY7+4c/VpA== X-Google-Smtp-Source: ABdhPJy6MZXSsX1TWSxYSH8AZSFlF65IrsrCZUIp9UGo7ZyLb5P7nnWKAIw1oWOcImxV8CdJBE95PQ== X-Received: by 2002:a17:907:2da3:: with SMTP id gt35mr8979972ejc.314.1639521866713; Tue, 14 Dec 2021 14:44:26 -0800 (PST) Received: from localhost.localdomain (93-42-71-246.ip85.fastwebnet.it. [93.42.71.246]) by smtp.googlemail.com with ESMTPSA id b19sm39008ejl.152.2021.12.14.14.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 14:44:26 -0800 (PST) From: Ansuel Smith To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Ansuel Smith Subject: [net-next PATCH RFC v6 05/16] net: dsa: tag_qca: convert to FIELD macro Date: Tue, 14 Dec 2021 23:43:58 +0100 Message-Id: <20211214224409.5770-6-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211214224409.5770-1-ansuelsmth@gmail.com> References: <20211214224409.5770-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert driver to FIELD macro to drop redundant define. Signed-off-by: Ansuel Smith --- net/dsa/tag_qca.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c index 1ea9401b8ace..55fa6b96b4eb 100644 --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -4,29 +4,24 @@ */ #include +#include #include "dsa_priv.h" #define QCA_HDR_LEN 2 #define QCA_HDR_VERSION 0x2 -#define QCA_HDR_RECV_VERSION_MASK GENMASK(15, 14) -#define QCA_HDR_RECV_VERSION_S 14 -#define QCA_HDR_RECV_PRIORITY_MASK GENMASK(13, 11) -#define QCA_HDR_RECV_PRIORITY_S 11 -#define QCA_HDR_RECV_TYPE_MASK GENMASK(10, 6) -#define QCA_HDR_RECV_TYPE_S 6 +#define QCA_HDR_RECV_VERSION GENMASK(15, 14) +#define QCA_HDR_RECV_PRIORITY GENMASK(13, 11) +#define QCA_HDR_RECV_TYPE GENMASK(10, 6) #define QCA_HDR_RECV_FRAME_IS_TAGGED BIT(3) -#define QCA_HDR_RECV_SOURCE_PORT_MASK GENMASK(2, 0) - -#define QCA_HDR_XMIT_VERSION_MASK GENMASK(15, 14) -#define QCA_HDR_XMIT_VERSION_S 14 -#define QCA_HDR_XMIT_PRIORITY_MASK GENMASK(13, 11) -#define QCA_HDR_XMIT_PRIORITY_S 11 -#define QCA_HDR_XMIT_CONTROL_MASK GENMASK(10, 8) -#define QCA_HDR_XMIT_CONTROL_S 8 +#define QCA_HDR_RECV_SOURCE_PORT GENMASK(2, 0) + +#define QCA_HDR_XMIT_VERSION GENMASK(15, 14) +#define QCA_HDR_XMIT_PRIORITY GENMASK(13, 11) +#define QCA_HDR_XMIT_CONTROL GENMASK(10, 8) #define QCA_HDR_XMIT_FROM_CPU BIT(7) -#define QCA_HDR_XMIT_DP_BIT_MASK GENMASK(6, 0) +#define QCA_HDR_XMIT_DP_BIT GENMASK(6, 0) static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) { @@ -40,8 +35,9 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) phdr = dsa_etype_header_pos_tx(skb); /* Set the version field, and set destination port information */ - hdr = QCA_HDR_VERSION << QCA_HDR_XMIT_VERSION_S | - QCA_HDR_XMIT_FROM_CPU | BIT(dp->index); + hdr = FIELD_PREP(QCA_HDR_XMIT_VERSION, QCA_HDR_VERSION); + hdr |= QCA_HDR_XMIT_FROM_CPU; + hdr |= FIELD_PREP(QCA_HDR_XMIT_DP_BIT, BIT(dp->index)); *phdr = htons(hdr); @@ -62,7 +58,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) hdr = ntohs(*phdr); /* Make sure the version is correct */ - ver = (hdr & QCA_HDR_RECV_VERSION_MASK) >> QCA_HDR_RECV_VERSION_S; + ver = FIELD_GET(QCA_HDR_RECV_VERSION, hdr); if (unlikely(ver != QCA_HDR_VERSION)) return NULL; @@ -71,7 +67,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) dsa_strip_etype_header(skb, QCA_HDR_LEN); /* Get source port information */ - port = (hdr & QCA_HDR_RECV_SOURCE_PORT_MASK); + port = FIELD_GET(QCA_HDR_RECV_SOURCE_PORT, hdr); skb->dev = dsa_master_find_slave(dev, 0, port); if (!skb->dev) -- 2.33.1