2019-12-18 08:02:14 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
/*
|
|
|
|
* Copyright (c) 2019 Pengutronix, Oleksij Rempel <kernel@pengutronix.de>
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <linux/bitfield.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
|
2022-11-21 13:55:47 +00:00
|
|
|
#include "tag.h"
|
2019-12-18 08:02:14 +00:00
|
|
|
|
net: dsa: provide a second modalias to tag proto drivers based on their name
Currently, tagging protocol drivers have a modalias of
"dsa_tag:id-<number>", where the number is one of DSA_TAG_PROTO_*_VALUE.
This modalias makes it possible for the request_module() call in
dsa_tag_driver_get() to work, given the input it has - an integer
returned by ds->ops->get_tag_protocol().
It is also possible to change tagging protocols at (pseudo-)runtime, via
sysfs or via device tree, and this works via the name string of the
tagging protocol rather than via its id (DSA_TAG_PROTO_*_VALUE).
In the latter case, there is no request_module() call, because there is
no association that the DSA core has between the string name and the ID,
to construct the modalias. The module is simply assumed to have been
inserted. This is actually slightly problematic when the tagging
protocol change should take place at probe time, since it's expected
that the dependency module should get autoloaded.
For this purpose, let's introduce a second modalias, so that the DSA
core can call request_module() by name. There is no reason to make the
modalias by name optional, so just modify the MODULE_ALIAS_DSA_TAG_DRIVER()
macro to take both the ID and the name as arguments, and generate two
modaliases behind the scenes.
Suggested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Michael Walle <michael@walle.cc> # on kontron-sl28 w/ ocelot_8021q
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2022-11-15 01:18:44 +00:00
|
|
|
#define AR9331_NAME "ar9331"
|
|
|
|
|
2019-12-18 08:02:14 +00:00
|
|
|
#define AR9331_HDR_LEN 2
|
|
|
|
#define AR9331_HDR_VERSION 1
|
|
|
|
|
|
|
|
#define AR9331_HDR_VERSION_MASK GENMASK(15, 14)
|
|
|
|
#define AR9331_HDR_PRIORITY_MASK GENMASK(13, 12)
|
|
|
|
#define AR9331_HDR_TYPE_MASK GENMASK(10, 8)
|
|
|
|
#define AR9331_HDR_BROADCAST BIT(7)
|
|
|
|
#define AR9331_HDR_FROM_CPU BIT(6)
|
|
|
|
/* AR9331_HDR_RESERVED - not used or may be version field.
|
|
|
|
* According to the AR8216 doc it should 0b10. On AR9331 it is 0b11 on RX path
|
|
|
|
* and should be set to 0b11 to make it work.
|
|
|
|
*/
|
|
|
|
#define AR9331_HDR_RESERVED_MASK GENMASK(5, 4)
|
|
|
|
#define AR9331_HDR_PORT_NUM_MASK GENMASK(3, 0)
|
|
|
|
|
|
|
|
static struct sk_buff *ar9331_tag_xmit(struct sk_buff *skb,
|
|
|
|
struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct dsa_port *dp = dsa_slave_to_port(dev);
|
|
|
|
__le16 *phdr;
|
|
|
|
u16 hdr;
|
|
|
|
|
|
|
|
phdr = skb_push(skb, AR9331_HDR_LEN);
|
|
|
|
|
|
|
|
hdr = FIELD_PREP(AR9331_HDR_VERSION_MASK, AR9331_HDR_VERSION);
|
|
|
|
hdr |= AR9331_HDR_FROM_CPU | dp->index;
|
|
|
|
/* 0b10 for AR8216 and 0b11 for AR9331 */
|
|
|
|
hdr |= AR9331_HDR_RESERVED_MASK;
|
|
|
|
|
|
|
|
phdr[0] = cpu_to_le16(hdr);
|
|
|
|
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sk_buff *ar9331_tag_rcv(struct sk_buff *skb,
|
2021-07-31 14:14:32 +00:00
|
|
|
struct net_device *ndev)
|
2019-12-18 08:02:14 +00:00
|
|
|
{
|
|
|
|
u8 ver, port;
|
|
|
|
u16 hdr;
|
|
|
|
|
|
|
|
if (unlikely(!pskb_may_pull(skb, AR9331_HDR_LEN)))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
hdr = le16_to_cpu(*(__le16 *)skb_mac_header(skb));
|
|
|
|
|
|
|
|
ver = FIELD_GET(AR9331_HDR_VERSION_MASK, hdr);
|
|
|
|
if (unlikely(ver != AR9331_HDR_VERSION)) {
|
|
|
|
netdev_warn_once(ndev, "%s:%i wrong header version 0x%2x\n",
|
|
|
|
__func__, __LINE__, hdr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(hdr & AR9331_HDR_FROM_CPU)) {
|
|
|
|
netdev_warn_once(ndev, "%s:%i packet should not be from cpu 0x%2x\n",
|
|
|
|
__func__, __LINE__, hdr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
skb_pull_rcsum(skb, AR9331_HDR_LEN);
|
|
|
|
|
|
|
|
/* Get source port information */
|
|
|
|
port = FIELD_GET(AR9331_HDR_PORT_NUM_MASK, hdr);
|
|
|
|
|
|
|
|
skb->dev = dsa_master_find_slave(ndev, 0, port);
|
|
|
|
if (!skb->dev)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct dsa_device_ops ar9331_netdev_ops = {
|
net: dsa: provide a second modalias to tag proto drivers based on their name
Currently, tagging protocol drivers have a modalias of
"dsa_tag:id-<number>", where the number is one of DSA_TAG_PROTO_*_VALUE.
This modalias makes it possible for the request_module() call in
dsa_tag_driver_get() to work, given the input it has - an integer
returned by ds->ops->get_tag_protocol().
It is also possible to change tagging protocols at (pseudo-)runtime, via
sysfs or via device tree, and this works via the name string of the
tagging protocol rather than via its id (DSA_TAG_PROTO_*_VALUE).
In the latter case, there is no request_module() call, because there is
no association that the DSA core has between the string name and the ID,
to construct the modalias. The module is simply assumed to have been
inserted. This is actually slightly problematic when the tagging
protocol change should take place at probe time, since it's expected
that the dependency module should get autoloaded.
For this purpose, let's introduce a second modalias, so that the DSA
core can call request_module() by name. There is no reason to make the
modalias by name optional, so just modify the MODULE_ALIAS_DSA_TAG_DRIVER()
macro to take both the ID and the name as arguments, and generate two
modaliases behind the scenes.
Suggested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Michael Walle <michael@walle.cc> # on kontron-sl28 w/ ocelot_8021q
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2022-11-15 01:18:44 +00:00
|
|
|
.name = AR9331_NAME,
|
2019-12-18 08:02:14 +00:00
|
|
|
.proto = DSA_TAG_PROTO_AR9331,
|
|
|
|
.xmit = ar9331_tag_xmit,
|
|
|
|
.rcv = ar9331_tag_rcv,
|
2021-06-11 19:01:24 +00:00
|
|
|
.needed_headroom = AR9331_HDR_LEN,
|
2019-12-18 08:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_LICENSE("GPL v2");
|
net: dsa: provide a second modalias to tag proto drivers based on their name
Currently, tagging protocol drivers have a modalias of
"dsa_tag:id-<number>", where the number is one of DSA_TAG_PROTO_*_VALUE.
This modalias makes it possible for the request_module() call in
dsa_tag_driver_get() to work, given the input it has - an integer
returned by ds->ops->get_tag_protocol().
It is also possible to change tagging protocols at (pseudo-)runtime, via
sysfs or via device tree, and this works via the name string of the
tagging protocol rather than via its id (DSA_TAG_PROTO_*_VALUE).
In the latter case, there is no request_module() call, because there is
no association that the DSA core has between the string name and the ID,
to construct the modalias. The module is simply assumed to have been
inserted. This is actually slightly problematic when the tagging
protocol change should take place at probe time, since it's expected
that the dependency module should get autoloaded.
For this purpose, let's introduce a second modalias, so that the DSA
core can call request_module() by name. There is no reason to make the
modalias by name optional, so just modify the MODULE_ALIAS_DSA_TAG_DRIVER()
macro to take both the ID and the name as arguments, and generate two
modaliases behind the scenes.
Suggested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Michael Walle <michael@walle.cc> # on kontron-sl28 w/ ocelot_8021q
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2022-11-15 01:18:44 +00:00
|
|
|
MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_AR9331, AR9331_NAME);
|
2019-12-18 08:02:14 +00:00
|
|
|
module_dsa_tag_driver(ar9331_netdev_ops);
|