Hi Bruce,
Could you please help to merge below kernel patches to branch
"v5.10/standard/nxp-sdk-5.10/nxp-soc" ?
This is to add felix dsa switch tag and vlan feature.
The following changes since commit
607accab2148bcfff2e7f72b4334cf106a414152:
Merge branch 'v5.10/standard/base' into
v5.10/standard/nxp-sdk-5.10/nxp-soc (2022-07-05 16:57:51 -0400)
are available in the Git repository at:
https://github.com/xulinsun/nxp-ls1028
v5.10/standard/nxp-sdk-5.10/nxp-soc
for you to fetch changes up to cf57a28090bd6628a0dbccddfd771d071ac19126:
net: dsa: felix: replace FELIX_NUM_TC with OCELOT_NUM_TC (2022-07-08
10:16:14 +0800)
----------------------------------------------------------------
Arnd Bergmann (2):
net: mscc: ocelot: select NET_DEVLINK
net: dsa: tag_ocelot_8021q: fix driver dependency
Christian Eggers (2):
net: ptp: introduce common defines for PTP message types
net: dsa: avoid potential use-after-free error
Dan Carpenter (2):
net: mscc: ocelot: fix error handling bugs in
mscc_ocelot_init_ports()
net: mscc: ocelot: fix error code in mscc_ocelot_probe()
George McCollister (1):
net: dsa: don't assign an error value to tag_ops
Guobin Huang (1):
net: mscc: ocelot: remove redundant dev_err call in
vsc9959_mdio_bus_alloc()
Gustavo A. R. Silva (1):
net: mscc: ocelot: Fix fall-through warnings for Clang
Horatiu Vultur (1):
net: mscc: ocelot: be able to reuse a devlink_port after teardown
Michael Walle (1):
net: dsa: felix: re-enable TAS guard band mode
Tobias Waldekranz (4):
net: dsa: Don't offload port attributes on standalone ports
net: dsa: Link aggregation support
net: dsa: Only notify CPU ports of changes to the tag protocol
net: dsa: Allow default tag protocol to be overridden from DT
Vladimir Oltean (101):
net: dsa: export the dsa_port_is_{user,cpu,dsa} helpers
net: bridge: notify switchdev of disappearance of old FDB entry
upon migration
net: dsa: be louder when a non-legacy FDB operation fails
net: dsa: don't use switchdev_notifier_fdb_info in
dsa_switchdev_event_work
net: dsa: move switchdev event implementation under the same
switch/case statement
net: dsa: exit early in dsa_slave_switchdev_event if we can't
program the FDB
net: dsa: listen for SWITCHDEV_{FDB,DEL}_ADD_TO_DEVICE on foreign
bridge neighbors
net: mscc: ocelot: classify L2 mdb entries as LOCKED
net: mscc: ocelot: use ether_addr_copy
net: mscc: ocelot: remove the "new" variable in ocelot_port_mdb_add
net: mscc: ocelot: make entry_type a member of struct
ocelot_multicast
net: mscc: ocelot: support L2 multicast entries
net: mscc: ocelot: use the pvid of zero when bridged with
vlan_filtering=0
net: mscc: ocelot: don't reset the pvid to 0 when deleting it
net: mscc: ocelot: transform the pvid and native vlan values into
a structure
net: mscc: ocelot: add a "valid" boolean to struct ocelot_vlan
net: mscc: ocelot: move the logic to drop 802.1p traffic to the
pvid deletion
net: mscc: ocelot: deny changing the native VLAN from the prepare
phase
net: dsa: felix: improve the workaround for multiple native VLANs
on NPI port
net: mscc: ocelot: install MAC addresses in .ndo_set_rx_mode from
process context
net: mscc: ocelot: auto-detect packet buffer size and number of
frame references
net: mscc: ocelot: add ops for decoding watermark threshold and
occupancy
net: dsa: add ops for devlink-sb
net: dsa: felix: reindent struct dsa_switch_ops
net: mscc: ocelot: export NUM_TC constant from felix to common
switch lib
net: mscc: ocelot: delete unused ocelot_set_cpu_port prototype
net: mscc: ocelot: register devlink ports
net: mscc: ocelot: initialize watermarks to sane defaults
net: mscc: ocelot: configure watermarks using devlink-sb
net: dsa: tag_8021q: add helpers to deduce whether a VLAN ID is
RX or TX VLAN
net: mscc: ocelot: export VCAP structures to include/soc/mscc
net: mscc: ocelot: store a namespaced VCAP filter ID
net: mscc: ocelot: reapply bridge forwarding mask on bonding
join/leave
net: mscc: ocelot: don't use NPI tag prefix for the CPU port module
net: dsa: document the existing switch tree notifiers and add a
new one
net: dsa: keep a copy of the tagging protocol in the DSA switch tree
net: dsa: allow changing the tag protocol via the "tagging"
device attribute
net: dsa: felix: convert to the new .change_tag_protocol DSA API
net: dsa: add a second tagger for Ocelot switches based on tag_8021q
net: dsa: felix: perform switch setup for tag_8021q
net: dsa: fix SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING getting
ignored
net: dsa: automatically bring up DSA master when opening user port
net: dsa: automatically bring user ports down when master goes down
net: dsa: make assisted_learning_on_cpu_port bypass offloaded LAG
interfaces
net: mscc: ocelot: rename ocelot_netdevice_port_event to
ocelot_netdevice_changeupper
net: mscc: ocelot: use a switch-case statement in
ocelot_netdevice_event
net: mscc: ocelot: don't refuse bonding interfaces we can't offload
net: mscc: ocelot: use ipv6 in the aggregation code
net: mscc: ocelot: set up the bonding mask in a way that avoids a
net_device
net: mscc: ocelot: avoid unneeded "lp" variable in LAG join
net: mscc: ocelot: set up logical port IDs centrally
net: mscc: ocelot: drop the use of the "lags" array
net: mscc: ocelot: rename aggr_count to num_ports_in_lag
net: mscc: ocelot: rebalance LAGs on link up/down events
net: dsa: felix: propagate the LAG offload ops towards the ocelot
lib
net: dsa: felix: restore multicast flood to CPU when NPI tagger
reinitializes
net: mscc: ocelot: stop returning IRQ_NONE in ocelot_xtr_irq_handler
net: mscc: ocelot: only drain extraction queue on error
net: mscc: ocelot: better error handling in ocelot_xtr_irq_handler
net: mscc: ocelot: use DIV_ROUND_UP helper in
ocelot_port_inject_frame
net: mscc: ocelot: refactor ocelot_port_inject_frame out of
ocelot_port_xmit
net: dsa: tag_ocelot: avoid accessing ds->priv in ocelot_rcv
net: mscc: ocelot: use common tag parsing code with DSA
net: dsa: tag_ocelot: single out PTP-related transmit tag processing
net: dsa: tag_ocelot: create separate tagger for Seville
net: mscc: ocelot: refactor ocelot_xtr_irq_handler into
ocelot_xtr_poll
net: dsa: felix: setup MMIO filtering rules for PTP when using
tag_8021q
net: dsa: tag_ocelot_8021q: add support for PTP timestamping
net: mscc: ocelot: avoid type promotion when calling
ocelot_ifh_set_dest
net: mscc: ocelot: select PACKING in the Kconfig
net: dsa: fix switchdev objects on bridge master mistakenly being
applied on ports
net: ocelot: support multiple bridges
net: dsa: call dsa_port_bridge_join when joining a LAG that is
already in a bridge
net: dsa: felix: set TX flow control according to the
phylink_mac_link_up resolution
net: dsa: tag_sja1105: stop resetting network and transport headers
net: dsa: tag_8021q: refactor RX VLAN parsing into a dedicated
function
net: dsa: sja1105: make SJA1105_SKB_CB fit a full timestamp
net: mscc: ocelot: make use of all 63 PTP timestamp identifiers
net: mscc: ocelot: avoid overflowing the PTP timestamp FIFO
net: mscc: ocelot: deny TX timestamping of non-PTP packets
net: mscc: ocelot: cross-check the sequence id from the timestamp
FIFO with the skb PTP header
net: dsa: tag_ocelot: break circular dependency with ocelot
switch lib driver
net: dsa: hold rtnl_lock in dsa_switch_setup_tag_protocol
net: mscc: ocelot: fix VCAP filters remaining active after being
deleted
net: mscc: ocelot: support egress VLAN rewriting via VCAP ES0
net: mscc: ocelot: write full VLAN TCI in the injection header
net: dsa: felix: accept "ethernet-ports" OF node name
net: mscc: ocelot: allow forwarding from bridge ports to the
tag_8021q CPU port
net: mscc: ocelot: allow probing to continue with ports that fail
to register
net: mscc: ocelot: use helpers for port VLAN membership
net: mscc: ocelot: add a type definition for REW_TAG_CFG_TAG_CFG
net: mscc: ocelot: convert the VLAN masks to a list
net: mscc: ocelot: allow a config where all bridge VLANs are
egress-untagged
net: mscc: ocelot: add the local station MAC addresses in VID 0
net: dsa: felix: perform teardown on error in felix_setup
net: dsa: tag_ocelot_8021q: break circular dependency with ocelot
switch lib
net: dsa: felix: purge skb from TX timestamping queue if it
cannot be sent
net: dsa: tag_ocelot_8021q: fix inability to inject STP BPDUs
into BLOCKING ports
net: dsa: tag_ocelot: set the classified VLAN during xmit
net: dsa: felix: break at first CPU port during init and teardown
arm64: dts: ls1028a: mark internal links between Felix and ENETC
as capable of flow control
Xiaoliang Yang (1):
net: dsa: felix: disable always guard band bit for TAS config
Xu Wang (1):
net: mscc: ocelot: Remove unneeded semicolon
Xulin Sun (2):
arm64: dts: fsl-ls1028a: enable dsa-tag-protocol to ocelot-8021q
by default
net: dsa: felix: replace FELIX_NUM_TC with OCELOT_NUM_TC
Yangbo Lu (6):
net: dsa: check tx timestamp request in core driver
net: dsa: no longer identify PTP packet in core driver
net: dsa: no longer clone skb in core driver
net: dsa: free skb->cb usage in core driver
net: mscc: ocelot: convert to ocelot_port_txtstamp_request()
net: mscc: ocelot: support PTP Sync one-step timestamping
Yixing Liu (1):
net: ocelot: fix a trailling format issue with block comments
Documentation/ABI/testing/sysfs-class-net-dsa | 11 +-
Documentation/networking/dsa/dsa.rst | 4 -
MAINTAINERS | 1 +
arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 1 +
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 4 +
drivers/net/dsa/mv88e6xxx/hwtstamp.c | 26 ++-
drivers/net/dsa/mv88e6xxx/hwtstamp.h | 10 +-
drivers/net/dsa/ocelot/Kconfig | 2 +
drivers/net/dsa/ocelot/felix.c | 1159
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
drivers/net/dsa/ocelot/felix.h | 19 +-
drivers/net/dsa/ocelot/felix_tsn.c | 8 +-
drivers/net/dsa/ocelot/felix_vsc9959.c | 66 +++---
drivers/net/dsa/ocelot/seville_vsc9953.c | 49 ++---
drivers/net/dsa/sja1105/sja1105_main.c | 2 +-
drivers/net/dsa/sja1105/sja1105_ptp.c | 18 +-
drivers/net/dsa/sja1105/sja1105_ptp.h | 4 +-
drivers/net/ethernet/mscc/Kconfig | 2 +
drivers/net/ethernet/mscc/Makefile | 3 +-
drivers/net/ethernet/mscc/ocelot.c | 1227
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
drivers/net/ethernet/mscc/ocelot.h | 56 ++---
drivers/net/ethernet/mscc/ocelot_devlink.c | 885
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/ethernet/mscc/ocelot_flower.c | 132 ++++++++++--
drivers/net/ethernet/mscc/ocelot_net.c | 551
+++++++++++++++++++++++++++++++++---------------
drivers/net/ethernet/mscc/ocelot_vcap.c | 20 +-
drivers/net/ethernet/mscc/ocelot_vcap.h | 295
+-------------------------
drivers/net/ethernet/mscc/ocelot_vsc7514.c | 334
++++++++++++-----------------
include/linux/dsa/8021q.h | 17 ++
include/linux/dsa/ocelot.h | 267
+++++++++++++++++++++++
include/linux/dsa/sja1105.h | 5 +-
include/linux/ptp_classify.h | 7 +-
include/net/dsa.h | 161 ++++++++++++--
include/soc/mscc/ocelot.h | 151 +++++++++----
include/soc/mscc/ocelot_ptp.h | 3 +
include/soc/mscc/ocelot_qsys.h | 7 +-
include/soc/mscc/ocelot_vcap.h | 307
+++++++++++++++++++++++++++
net/bridge/br_fdb.c | 1 +
net/dsa/Kconfig | 21 +-
net/dsa/Makefile | 1 +
net/dsa/dsa.c | 26 +++
net/dsa/dsa2.c | 467
+++++++++++++++++++++++++++++++++++++---
net/dsa/dsa_priv.h | 89 ++++++++
net/dsa/master.c | 39 +++-
net/dsa/port.c | 137 ++++++++++--
net/dsa/slave.c | 369
+++++++++++++++++++++++---------
net/dsa/switch.c | 94 +++++++++
net/dsa/tag_8021q.c | 38 +++-
net/dsa/tag_ocelot.c | 265
+++++++++--------------
net/dsa/tag_ocelot_8021q.c | 83 ++++++++
net/dsa/tag_sja1105.c | 37 ++--
49 files changed, 5863 insertions(+), 1618 deletions(-)
create mode 100644 drivers/net/ethernet/mscc/ocelot_devlink.c
create mode 100644 include/linux/dsa/ocelot.h
create mode 100644 net/dsa/tag_ocelot_8021q.c
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11448):
https://lists.yoctoproject.org/g/linux-yocto/message/11448
Mute This Topic: https://lists.yoctoproject.org/mt/92244651/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
