Vladimir Oltean 9934800436 net: dsa: felix: update destinations of existing traps with ocelot-8021q ... Historically, the felix DSA driver has installed special traps such that PTP over L2 works with the ocelot-8021q tagging protocol; commit 0a6f17c6ae ("net: dsa: tag_ocelot_8021q: add support for PTP timestamping") has the details. Then the ocelot switch library also gained more comprehensive support for PTP traps through commit 96ca08c058 ("net: mscc: ocelot: set up traps for PTP packets"). Right now, PTP over L2 works using ocelot-8021q via the traps it has set for itself, but nothing else does. Consolidating the two code blocks would make ocelot-8021q gain support for PTP over L4 and tc-flower traps, and at the same time avoid some code and TCAM duplication. The traps are similar in intent, but different in execution, so some explanation is required. The traps set up by felix_setup_mmio_filtering() are VCAP IS1 filters, which have a PAG that chains them to a VCAP IS2 filter, and the IS2 is where the 'trap' action resides. The traps set up by ocelot_trap_add(), on the other hand, have a single filter, in VCAP IS2. The reason for chaining VCAP IS1 and IS2 in Felix was to ensure that the hardcoded traps take precedence and cannot be overridden by the Ocelot switch library. So in principle, the PTP traps needed for ocelot-8021q in the Felix driver can rely on ocelot_trap_add(), but the filters need to be patched to account for a quirk that LS1028A has: the quirk_no_xtr_irq described in commit 0a6f17c6ae ("net: dsa: tag_ocelot_8021q: add support for PTP timestamping"). Live-patching is done by iterating through the trap list every time we know it has been updated, and transforming a trap into a redirect + CPU copy if ocelot-8021q is in use. Making the DSA ocelot-8021q tagger work with the Ocelot traps means we can eliminate the dedicated OCELOT_VCAP_IS1_TAG_8021Q_PTP_MMIO and OCELOT_VCAP_IS2_TAG_8021Q_PTP_MMIO cookies. To minimize the patch delta, OCELOT_VCAP_IS2_MRP_TRAP takes the place of OCELOT_VCAP_IS2_TAG_8021Q_PTP_MMIO (the alternative would have been to left-shift all cookie numbers by 1). Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2022-02-17 14:06:51 +00:00
..
acpi	USB/Thunderbolt changes for 5.17-rc1	2022-01-12 11:27:57 -08:00
asm-generic	bitmap patches for 5.17-rc1	2022-01-23 06:20:44 +02:00
clocksource
crypto	lib/crypto: blake2s: avoid indirect calls to compression function for Clang CFI	2022-02-04 19:22:32 +01:00
drm
dt-bindings	Char/Misc and other driver changes for 5.17-rc1	2022-01-14 16:02:28 +01:00
keys
kunit	kunit: replace kernel.h with the necessary inclusions	2022-01-20 08:52:54 +02:00
kvm	RISCV:	2022-01-16 16:15:14 +02:00
linux	net: wwan: debugfs obtained dev reference not dropped	2022-02-14 14:09:59 +00:00
math-emu
media
memory
misc
net	mptcp: mptcp_parse_option is no longer exported	2022-02-16 20:52:04 -08:00
pcmcia
ras	mm/hwpoison: remove MF_MSG_BUDDY_2ND and MF_MSG_POISONED_HUGE	2022-01-15 16:30:31 +02:00
rdma
scsi	Merge branch 'akpm' (patches from Andrew)	2022-01-22 11:28:23 +02:00
soc	net: dsa: felix: update destinations of existing traps with ocelot-8021q	2022-02-17 14:06:51 +00:00
sound	ASoC: Fixes for v5.17	2022-02-01 16:52:54 +01:00
target
trace	net: dev: Makes sure netif_rx() can be invoked in any context.	2022-02-14 13:38:35 +00:00
uapi	net/smc: Add global configure for handshake limitation by netlink	2022-02-11 11:14:58 +00:00
vdso
video
xen	xen: xenbus_dev.h: delete incorrect file name	2022-02-03 08:16:32 +01:00