ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-31 08:25:29 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ipq807x: fix wrong define for LAN and WAN ess mask

Browse Source 
switch_lan_bmp and switch_wan_bmp have wrong values and now cause
problems with the new version of the qca-ssdk.

Fix the wrong entry and drop the redundant switch_cpu_bmp.

Also introduce some convenient define to better understand values in
this map.

Fixes: eea264feadcf ("kernel: qca-ssdk: update to 12.4")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Tested-by: Robert Marko <robimarko@gmail.com> # Dynalink AX3600 and Qnap 301W
Reviewed by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Christian Marangi 2023-11-10 18:38:34 +01:00
parent d83231603c
commit 947b44d9ae
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
17 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
View File

@ -271,9 +271,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
switch_lan_bmp = <0x1e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
switch_wan_bmp = <0x20>; /* wan port bitmap */
switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/

9
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
View File

@ -235,9 +235,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
switch_lan_bmp = <0x1e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
switch_wan_bmp = <0x20>; /* wan port bitmap */
switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
@ -245,10 +244,6 @@
tm_tick_mode = <0>; /* tm tick mode */ tm_tick_mode = <0>; /* tm tick mode */
qcom,port_phyinfo { qcom,port_phyinfo {
port@0 {
port_id = <1>;
phy_address = <0>;
};
port@1 { port@1 {
port_id = <2>; port_id = <2>;
phy_address = <1>; phy_address = <1>;

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts
View File

@ -343,9 +343,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <ESS_PORT5>; /* lan port bitmap */
switch_lan_bmp = <0x3e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
switch_wan_bmp = <0x40>; /* wan port bitmap */
switch_mac_mode = <0xff>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0xff>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xf>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xf>; /* mac mode for uniphy instance2*/

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
View File

@ -321,9 +321,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>; /* lan port bitmap */
switch_lan_bmp = <0x3e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
switch_wan_bmp = <0xc0>; /* wan port bitmap */
switch_mac_mode = <0xb>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0xb>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xd>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xd>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xd>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xd>; /* mac mode for uniphy instance2*/

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
View File

@ -325,9 +325,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <ESS_PORT5>; /* lan port bitmap */
switch_lan_bmp = <0x3e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
switch_wan_bmp = <0x40>; /* wan port bitmap */
switch_mac_mode = <0xff>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0xff>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xf>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xf>; /* mac mode for uniphy instance2*/

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
View File

@ -382,9 +382,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
switch_lan_bmp = <0x1e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT5>; /* wan port bitmap */
switch_wan_bmp = <0x20>; /* wan port bitmap */
switch_mac_mode = <0xb>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0xb>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xc>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xc>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
View File

@ -169,9 +169,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
switch_lan_bmp = <0x3e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
switch_wan_bmp = <0x40>; /* wan port bitmap */
switch_mac_mode = <0xb>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0xb>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xc>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xc>; /* mac mode for uniphy instance2*/

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
View File

@ -186,9 +186,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
switch_lan_bmp = <0x1e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
switch_wan_bmp = <0x60>; /* wan port bitmap */
switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xe>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xe>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xd>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xd>; /* mac mode for uniphy instance2*/

4
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts
View File

@ -89,9 +89,7 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; switch_wan_bmp = <ESS_PORT6>;
switch_lan_bmp = <0x3e>;
switch_wan_bmp = <0x40>;
switch_mac_mode = <0x00>; switch_mac_mode = <0x00>;
switch_mac_mode1 = <0xff>; switch_mac_mode1 = <0xff>;
switch_mac_mode2 = <0x0f>; switch_mac_mode2 = <0x0f>;

4
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts
View File

@ -117,9 +117,7 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x01>; switch_wan_bmp = <ESS_PORT6>;
switch_lan_bmp = <0x3e>;
switch_wan_bmp = <0x40>;
switch_mac_mode = <0x00>; switch_mac_mode = <0x00>;
switch_mac_mode1 = <0xff>; switch_mac_mode1 = <0xff>;
switch_mac_mode2 = <0x0f>; switch_mac_mode2 = <0x0f>;

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
View File

@ -388,9 +388,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */
switch_lan_bmp = <0x3e>; /* lan port bitmap */ switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
switch_wan_bmp = <0x40>; /* wan port bitmap */
switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0x0f>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0x0f>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0x0f>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0x0f>; /* mac mode for uniphy instance2*/

6
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi
View File

@ -1,5 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
#include <dt-bindings/net/qcom-ipq-ess.h>
&clocks { &clocks {
bias_pll_cc_clk { bias_pll_cc_clk {
compatible = "fixed-clock"; compatible = "fixed-clock";
@ -19,8 +21,8 @@
compatible = "qcom,ess-switch-ipq807x"; compatible = "qcom,ess-switch-ipq807x";
reg = <0x3a000000 0x1000000>; reg = <0x3a000000 0x1000000>;
switch_access_mode = "local bus"; switch_access_mode = "local bus";
switch_cpu_bmp = <0x1>; /* cpu port bitmap */ switch_cpu_bmp = <ESS_PORT0>; /* cpu port bitmap */
switch_inner_bmp = <0x80>; /*inner port bitmap*/ switch_inner_bmp = <ESS_PORT7>; /*inner port bitmap*/
clocks = <&gcc GCC_CMN_12GPLL_AHB_CLK>, clocks = <&gcc GCC_CMN_12GPLL_AHB_CLK>,
<&gcc GCC_CMN_12GPLL_SYS_CLK>, <&gcc GCC_CMN_12GPLL_SYS_CLK>,
<&gcc GCC_UNIPHY0_AHB_CLK>, <&gcc GCC_UNIPHY0_AHB_CLK>,

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
View File

@ -298,9 +298,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>;
switch_lan_bmp = <0x3e>; switch_wan_bmp = <ESS_PORT6>;
switch_wan_bmp = <0x40>;
switch_mac_mode = <0x0>; switch_mac_mode = <0x0>;
switch_mac_mode1 = <0xf>; switch_mac_mode1 = <0xf>;
switch_mac_mode2 = <0xd>; switch_mac_mode2 = <0xd>;

4
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
View File

@ -195,8 +195,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_lan_bmp = <0x3e>; /* lan port bitmap */ switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>; /* lan port bitmap */
switch_wan_bmp = <0x40>; /* wan port bitmap */ switch_wan_bmp = <ESS_PORT6>; /* wan port bitmap */
switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/ switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/
switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/ switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/
switch_mac_mode2 = <0xd>; /* mac mode for uniphy instance2*/ switch_mac_mode2 = <0xd>; /* mac mode for uniphy instance2*/

7
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
View File

@ -150,10 +150,9 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x01>; switch_lan_bmp = <ESS_PORT4>;
switch_lan_bmp = <0x3e>; switch_wan_bmp = <ESS_PORT6>;
switch_wan_bmp = <0x40>;
switch_mac_mode = <0x00>; switch_mac_mode = <0x00>;
switch_mac_mode1 = <0xff>; switch_mac_mode1 = <0xff>;
switch_mac_mode2 = <0x0d>; switch_mac_mode2 = <0x0d>;

5
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
View File

@ -267,9 +267,8 @@
&switch { &switch {
status = "okay"; status = "okay";
switch_cpu_bmp = <0x1>; switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT5)>;
switch_lan_bmp = <0x3e>; switch_wan_bmp = <ESS_PORT6>;
switch_wan_bmp = <0x40>;
switch_mac_mode = <0xb>; switch_mac_mode = <0xb>;
switch_mac_mode1 = <0xd>; switch_mac_mode1 = <0xd>;
switch_mac_mode2 = <0xd>; switch_mac_mode2 = <0xd>;

15
target/linux/qualcommax/files/include/dt-bindings/net/qcom-ipq-ess.h Normal file
View File

@ -0,0 +1,15 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _DT_BINDINGS_NET_QCOM_IPQ_ESS_H
#define _DT_BINDINGS_NET_QCOM_IPQ_ESS_H
#define ESS_PORT0 0x1
#define ESS_PORT1 0x2
#define ESS_PORT2 0x4
#define ESS_PORT3 0x8
#define ESS_PORT4 0x10
#define ESS_PORT5 0x20
#define ESS_PORT6 0x40
#define ESS_PORT7 0x80
#endif /* _DT_BINDINGS_NET_QCOM_IPQ_ESS_H */