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 EE296C4332F for ; Sat, 11 Dec 2021 02:02:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345815AbhLKCGW (ORCPT ); Fri, 10 Dec 2021 21:06:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345784AbhLKCGJ (ORCPT ); Fri, 10 Dec 2021 21:06:09 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34938C061D5F; Fri, 10 Dec 2021 18:02:25 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id x15so36045244edv.1; Fri, 10 Dec 2021 18:02:25 -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=q2SJGM9ouzR0OJAtC1TTZL0Ns4pieplKsZlkIeRm9ng=; b=YFuSLd/tIolAWkWUvrc5QMNMqdz2hbM+Nsx+UsNO/Xrvs9wNtr0ZZbzXdMgUr+co5i hKHMmJgt92w9hSCAZvn3/mPkEq27Xv51tA7N/0uIPvDxDMDEYkdipYzT/OIbpl5NS9/A Fhcvp+ybiwf2N51UNmmCEpGNVR+ukZJ507ZybzROtZoTAwLtztMa3yxhrjCl9fSgFTgn jChjY3JL/p9XF4rah3HcBRjVPoS1n7tYvK+bMMNEOSD3iE9ccFBV4fckgMPxyLMhbUFg 5bf31mkMOzBEBJ545lgqUYqmG0JrEX7CWLnWMn2IaR9RFdmdvWgRzgfDrFqbRXbKblTQ lUIQ== 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=q2SJGM9ouzR0OJAtC1TTZL0Ns4pieplKsZlkIeRm9ng=; b=Q1igsk+M6l0RD+gXu5GC3dc2gl/5SPKuHp57defc0d5dHVfzhaGd3w5qIDzhcMMPn+ JS5IpXycdAmbWMgbZ6dmau12OmnT1QUCVXyv+Yfge/kqSYXiegxHlZ9OIwF7Rqc8+UXe 93ZICmAxR9pVhulXqk4/6BCJmeepMks+XxFa9LJmnmedhVvjOAXyntYm6a0c8+WOINX+ 6sQocyVpuRoIV7FynY2uc7UFpV/FmzwuXoELQ8XOCaMuIvF9lxeMpqYgNz6k62WeHiao PMJxxO1eiPv+N88CAuL0Bpzvfa8IlVL5ofSqNJIs6pMmEHfAQ6eJMY/OU+2Z7Z5+4YQH yfeQ== X-Gm-Message-State: AOAM532K3SlIUqzg73DSkSZ0OK6Ubg/8WdvnxsvXt1WfU3foaAvG0s0a vg+U73G2BCXHjcLqpwQODkI= X-Google-Smtp-Source: ABdhPJwgJglpGh1keabI/ZozLzL4/lm2S6gTtP9l0SPNbHEt8wauR3RvKBt5W1pPId3gwC0vQ09Z/g== X-Received: by 2002:a17:906:dc8d:: with SMTP id cs13mr28589224ejc.276.1639188143645; Fri, 10 Dec 2021 18:02:23 -0800 (PST) Received: from localhost.localdomain (93-42-71-246.ip85.fastwebnet.it. [93.42.71.246]) by smtp.googlemail.com with ESMTPSA id p13sm2265956eds.38.2021.12.10.18.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 18:02:23 -0800 (PST) From: Ansuel Smith To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Cc: Ansuel Smith Subject: [net-next RFC PATCH v3 06/15] net: dsa: tag_qca: move define to include linux/dsa Date: Sat, 11 Dec 2021 03:01:38 +0100 Message-Id: <20211211020155.10114-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211211020155.10114-1-ansuelsmth@gmail.com> References: <20211211020155.10114-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move tag_qca define to include dir linux/dsa as the qca8k require access to the tagger define to support in-band mdio read/write using ethernet packet. Signed-off-by: Ansuel Smith --- include/linux/dsa/tag_qca.h | 21 +++++++++++++++++++++ net/dsa/tag_qca.c | 16 +--------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 include/linux/dsa/tag_qca.h diff --git a/include/linux/dsa/tag_qca.h b/include/linux/dsa/tag_qca.h new file mode 100644 index 000000000000..c02d2d39ff4a --- /dev/null +++ b/include/linux/dsa/tag_qca.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __TAG_QCA_H +#define __TAG_QCA_H + +#define QCA_HDR_LEN 2 +#define QCA_HDR_VERSION 0x2 + +#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 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 GENMASK(6, 0) + +#endif /* __TAG_QCA_H */ diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c index 55fa6b96b4eb..34e565e00ece 100644 --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -5,24 +5,10 @@ #include #include +#include #include "dsa_priv.h" -#define QCA_HDR_LEN 2 -#define QCA_HDR_VERSION 0x2 - -#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 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 GENMASK(6, 0) - static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) { struct dsa_port *dp = dsa_slave_to_port(dev); -- 2.32.0