openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-07-17 10:11:55 +04:00
Code Issues Packages Projects Releases Wiki Activity

realtek: dsa/eth: adapt transmit path

Browse Source 
This is just some reordering/simplifcation of the transmit path.
Relocate the port extraction into a separate helper for a smaller
xmit function. While we are here add some documentation and
reorder the tag and its contents. As these are only arbitrary
values that help the ethernet driver to identifiy the tag this
is just cosmetic.

Link: https://github.com/openwrt/openwrt/pull/23948
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
This commit is contained in:
Markus Stockhausen
2026-06-24 11:59:29 +02:00
parent c77ac7db48
commit bc910540ad
2 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/realtek/files-6.18/drivers/net/ethernet/rtl838x_eth.c
+21 -14
View File
@@ -1001,25 +1001,32 @@ static void rteth_tx_timeout(struct net_device *dev, unsigned int txqueue)
}
}
static int rteth_start_xmit(struct sk_buff *skb, struct net_device *dev)
static int rteth_get_dsa_port(struct sk_buff *skb, struct net_device *dev)
{
struct rteth_ctrl *ctrl = netdev_priv(dev);
int val, slot, len = skb->len, port = -1;
int ring = skb_get_queue_mapping(skb);
u8 *trailer = &skb->data[skb->len - 4];
if (netdev_uses_dsa(dev) &&
dev->dsa_ptr->tag_ops->proto == DSA_TAG_PROTO_RTL_OTTO &&
trailer[0] < ctrl->r->cpu_port &&
trailer[1] == 0xab &&
trailer[2] == 0xcd &&
trailer[3] == 0xef)
return trailer[0];
return -1;
}
static int rteth_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
int port, val, slot, len = skb->len, ring = skb_get_queue_mapping(skb);
struct rteth_ctrl *ctrl = netdev_priv(dev);
struct rteth_packet *packet;
dma_addr_t packet_dma;
if (netdev_uses_dsa(dev) &&
skb->data[len - 4] == 0x80 &&
skb->data[len - 3] < ctrl->r->cpu_port &&
skb->data[len - 2] == 0x10 &&
skb->data[len - 1] == 0x00) {
port = skb->data[len - 3];
/* space will be reused for 4 byte layer 2 FCS */
} else {
/* No DSA tag, add space for 4 byte layer 2 FCS */
len += ETH_FCS_LEN;
}
port = rteth_get_dsa_port(skb, dev);
if (port < 0)
len += ETH_FCS_LEN; /* No reusable 4 byte tag, add space for 4 byte layer 2 FCS */
len = max(ETH_ZLEN + ETH_FCS_LEN, len);
if (unlikely(skb_put_padto(skb, len))) {
target/linux/realtek/files-6.18/net/dsa/tag_rtl_otto.c
+13 -21
View File
@@ -1,8 +1,4 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* net/dsa/tag_trailer.c - Trailer tag format handling
* Copyright (c) 2008-2009 Marvell Semiconductor
*/
#include <linux/etherdevice.h>
#include <linux/list.h>
@@ -10,24 +6,20 @@
#include "tag.h"
#define RTL_OTTO_NAME "rtl_otto"
/*
* TODO: This driver was copied over from trailer tagging. It will be developed
* downstream in OpenWrt in conjunction with the Realtek Otto ethernet driver.
* For now rely on the old trailer handling and keep everything as is.
*/
#define RTL_OTTO_NAME "rtl_otto"
#define RTL_OTTO_TAILROOM 4
static struct sk_buff *rtl_otto_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct dsa_port *dp = dsa_user_to_port(dev);
u8 *trailer;
trailer = skb_put(skb, 4);
trailer[0] = 0x80;
trailer[1] = dp->index;
trailer[2] = 0x10;
trailer[3] = 0x00;
/* Hardware needs space for Layer 2 FCS. Align tag size with that. */
trailer = skb_put(skb, RTL_OTTO_TAILROOM);
trailer[0] = dp->index;
trailer[1] = 0xab;
trailer[2] = 0xcd;
trailer[3] = 0xef;
return skb;
}
@@ -62,11 +54,11 @@ static struct sk_buff *rtl_otto_rcv(struct sk_buff *skb, struct net_device *dev)
}
static const struct dsa_device_ops rtl_otto_netdev_ops = {
.name = RTL_OTTO_NAME,
.proto = DSA_TAG_PROTO_RTL_OTTO,
.xmit = rtl_otto_xmit,
.rcv = rtl_otto_rcv,
.needed_tailroom = 4,
.name = RTL_OTTO_NAME,
.proto = DSA_TAG_PROTO_RTL_OTTO,
.xmit = rtl_otto_xmit,
.rcv = rtl_otto_rcv,
.needed_tailroom = RTL_OTTO_TAILROOM,
};
MODULE_DESCRIPTION("DSA tag driver for Realtek Otto switches (RTL83xx/RTL93xx)");