Commit f46b9b8e authored Jan 07, 2021 by Vladimir Oltean Committed by Jakub Kicinski Jan 07, 2021

net: dsa: move the Broadcom tag information in a separate header file



It is a bit strange to see something as specific as Broadcom SYSTEMPORT
bits in the main DSA include file. Move these away into a separate
header, and have the tagger and the SYSTEMPORT driver include them.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent c214cc3a

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -3400,6 +3400,7 @@ L: openwrt-devel@lists.openwrt.org (subscribers-only)
		S: Supported
		F: Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
		F: drivers/net/dsa/b53/*
		F: include/linux/dsa/brcm.h
		F: include/linux/platform_data/b53.h

		BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/netdevice.h>
		#include <linux/dsa/brcm.h>
		#include <linux/etherdevice.h>
		#include <linux/platform_device.h>
		#include <linux/of.h>

include/linux/dsa/brcm.h

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only
		* Copyright (C) 2014 Broadcom Corporation
		*/

		/* Included by drivers/net/ethernet/broadcom/bcmsysport.c and
		* net/dsa/tag_brcm.c
		*/
		#ifndef _NET_DSA_BRCM_H
		#define _NET_DSA_BRCM_H

		/* Broadcom tag specific helpers to insert and extract queue/port number */
		#define BRCM_TAG_SET_PORT_QUEUE(p, q) ((p) << 8 \| q)
		#define BRCM_TAG_GET_PORT(v) ((v) >> 8)
		#define BRCM_TAG_GET_QUEUE(v) ((v) & 0xff)

		#endif

include/net/dsa.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -878,12 +878,6 @@ static inline int call_dsa_notifiers(unsigned long val, struct net_device *dev,
		}
		#endif

		/* Broadcom tag specific helpers to insert and extract queue/port number */
		#define BRCM_TAG_SET_PORT_QUEUE(p, q) ((p) << 8 \| q)
		#define BRCM_TAG_GET_PORT(v) ((v) >> 8)
		#define BRCM_TAG_GET_QUEUE(v) ((v) & 0xff)


		netdev_tx_t dsa_enqueue_skb(struct sk_buff skb, struct net_device dev);
		int dsa_port_get_phy_strings(struct dsa_port dp, uint8_t data);
		int dsa_port_get_ethtool_phy_stats(struct dsa_port dp, uint64_t data);

net/dsa/tag_brcm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		* Copyright (C) 2014 Broadcom Corporation
		*/

		#include <linux/dsa/brcm.h>
		#include <linux/etherdevice.h>
		#include <linux/list.h>
		#include <linux/slab.h>