Revision 54fa49ee88138756df0fcf867cb1849904710a8c authored by Vladimir Oltean on 27 December 2019, 01:11:13 UTC, committed by David S. Miller on 31 December 2019, 04:15:02 UTC
For first-generation switches (SJA1105E and SJA1105T):
- TPID means C-Tag (typically 0x8100)
- TPID2 means S-Tag (typically 0x88A8)
While for the second generation switches (SJA1105P, SJA1105Q, SJA1105R,
SJA1105S) it is the other way around:
- TPID means S-Tag (typically 0x88A8)
- TPID2 means C-Tag (typically 0x8100)
In other words, E/T tags untagged traffic with TPID, and P/Q/R/S with
TPID2.
So the patch mentioned below fixed VLAN filtering for P/Q/R/S, but broke
it for E/T.
We strive for a common code path for all switches in the family, so just
lie in the static config packing functions that TPID and TPID2 are at
swapped bit offsets than they actually are, for P/Q/R/S. This will make
both switches understand TPID to be ETH_P_8021Q and TPID2 to be
ETH_P_8021AD. The meaning from the original E/T was chosen over P/Q/R/S
because E/T is actually the one with public documentation available
(UM10944.pdf).
Fixes: f9a1a7646c0d ("net: dsa: sja1105: Reverse TPID and TPID2")
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 3a323ed
Kconfig.cpu
# SPDX-License-Identifier: GPL-2.0
config CPU_H8300H
bool
config CPU_H8S
bool
config H83069
bool
select CPU_H8300H
select H8300_TMR16
select RENESAS_H8300H_INTC
config H8S2678
bool
select CPU_H8S
select H8300_TPU
select RENESAS_H8S_INTC
config RAMKERNEL
bool
config ROMKERNEL
bool
menu "Processor type and features"
choice
prompt "H8/300 platform"
config H8300_AE3068
bool "AE-3068/69"
select H83069
select RAMKERNEL
help
AKI-H8/3068F / AKI-H8/3069F Flashmicom LAN Board Support
More Information. (Japanese Only)
<http://akizukidenshi.com/catalog/default.aspx>
AE-3068/69 Evaluation Board Support
More Information.
<http://www.microtronique.com/ae3069lan.htm>
config H8300_H8MAX
bool "H8MAX"
select H83069
select RAMKERNEL
select HAVE_IDE
help
H8MAX Evaluation Board Support
More Information. (Japanese Only)
<http://strawberry-linux.com/h8/index.html>
config H8300_KANEBEBE
bool "KaneBebe"
select H83069
select RAMKERNEL
help
KaneBebe Evalition Board Support
More Information. (Japanese Only)
<http://www.nissin-tech.com/2009/10/uclinuxkane-bebe-h83069f.html>
config H8300H_SIM
bool "H8/300H GDB Simulator"
select H83069
select ROMKERNEL
help
GDB Simulator Support
More Information.
<http://sourceware.org/sid/>
config H8S_EDOSK2674
bool "EDOSK-2674"
select H8S2678
select RAMKERNEL
help
Renesas EDOSK-2674 Evaluation Board Support
More Information.
<http://www.azpower.com/H8-uClinux/index.html>
<http://www.renesas.eu/products/tools/introductory_evaluation_tools/evaluation_development_os_kits/edosk2674r/edosk2674r_software_tools_root.jsp>
config H8S_SIM
bool "H8S GDB Simulator"
select H8S2678
select ROMKERNEL
help
GDB Simulator Support
More Information.
<http://sourceware.org/sid/>
endchoice
config H8300_BUILTIN_DTB
string "Builtin DTB"
default ""
config OFFSET
hex "Load offset"
default 0
endmenu
Computing file changes ...
