hurricos/openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gotcha binch

Browse Source
This commit is contained in:
Martin Kennedy 2021-02-10 23:30:36 +00:00
parent 6e303ca958
commit 0ea1b55c49
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/linux/octeon/patches-5.4/705-last-debugs.patch
View File

@ -1,6 +1,8 @@
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
index 93a498d05184..27733d710355 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c --- a/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
@@ -121,38 +121,53 @@ int __cvmx_helper_xaui_enable(int interface) @@ -121,58 +121,80 @@ int __cvmx_helper_xaui_enable(int interface)
union cvmx_gmxx_tx_int_en gmx_tx_int_en; union cvmx_gmxx_tx_int_en gmx_tx_int_en;
union cvmx_pcsxx_int_en_reg pcsx_int_en_reg; union cvmx_pcsxx_int_en_reg pcsx_int_en_reg;
@ -54,8 +56,11 @@
xauiCtl.u64 = cvmx_read_csr(CVMX_PCSXX_CONTROL1_REG(interface)); xauiCtl.u64 = cvmx_read_csr(CVMX_PCSXX_CONTROL1_REG(interface));
xauiCtl.s.lo_pwr = 0; xauiCtl.s.lo_pwr = 0;
@@ -161,18 +176,24 @@ int __cvmx_helper_xaui_enable(int interface) /* Issuing a reset here seems to hang some CN68XX chips. */
!OCTEON_IS_MODEL(OCTEON_CN68XX_PASS2_X)) if (!OCTEON_IS_MODEL(OCTEON_CN68XX_PASS1_X) &&
- !OCTEON_IS_MODEL(OCTEON_CN68XX_PASS2_X))
+ !OCTEON_IS_MODEL(OCTEON_CN68XX_PASS2_X) &&
+ 0)
xauiCtl.s.reset = 1; xauiCtl.s.reset = 1;
+ cvmx_dprintf("4.4\n"); + cvmx_dprintf("4.4\n");
@ -79,7 +84,7 @@
/* Wait for RX to be ready */ /* Wait for RX to be ready */
if (CVMX_WAIT_FOR_FIELD64 if (CVMX_WAIT_FOR_FIELD64
(CVMX_GMXX_RX_XAUI_CTL(interface), union cvmx_gmxx_rx_xaui_ctl, (CVMX_GMXX_RX_XAUI_CTL(interface), union cvmx_gmxx_rx_xaui_ctl,
@@ -180,8 +201,11 @@ int __cvmx_helper_xaui_enable(int interface) @@ -180,8 +202,11 @@ int __cvmx_helper_xaui_enable(int interface)
return -1; return -1;
/* (6) Configure GMX */ /* (6) Configure GMX */
@ -91,7 +96,7 @@
cvmx_write_csr(CVMX_GMXX_PRTX_CFG(0, interface), gmx_cfg.u64); cvmx_write_csr(CVMX_GMXX_PRTX_CFG(0, interface), gmx_cfg.u64);
/* Wait for GMX RX to be idle */ /* Wait for GMX RX to be idle */
@@ -189,62 +213,87 @@ int __cvmx_helper_xaui_enable(int interface) @@ -189,62 +214,87 @@ int __cvmx_helper_xaui_enable(int interface)
(CVMX_GMXX_PRTX_CFG(0, interface), union cvmx_gmxx_prtx_cfg, (CVMX_GMXX_PRTX_CFG(0, interface), union cvmx_gmxx_prtx_cfg,
rx_idle, ==, 1, 10000)) rx_idle, ==, 1, 10000))
return -1; return -1;