Do not overwrite the RGMII bits in the CPU port register of Switch.

Fixes the network on Espressobin.

The GENERIC kernel now boots over NFS.

Sponsored by:	Rubicon Communications, LLC (Netgate)
This commit is contained in:
Luiz Otavio O Souza 2019-06-06 21:25:46 +00:00
parent f02125cdfd
commit 5429f5f309
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=348762
2 changed files with 5 additions and 2 deletions

View File

@ -441,10 +441,12 @@ e6000sw_attach(device_t dev)
* Force speed, full-duplex, EEE off and flow-control
* on.
*/
reg &= ~(PSC_CONTROL_SPD2500 | PSC_CONTROL_ALT_SPD |
PSC_CONTROL_FORCED_EEE);
if (e6000sw_is_fixed25port(sc, port))
reg = PSC_CONTROL_SPD2500;
reg |= PSC_CONTROL_SPD2500;
else
reg = PSC_CONTROL_SPD1000;
reg |= PSC_CONTROL_SPD1000;
reg |= PSC_CONTROL_FORCED_DPX | PSC_CONTROL_FULLDPX |
PSC_CONTROL_FORCED_LINK | PSC_CONTROL_LINK_UP |
PSC_CONTROL_FORCED_FC | PSC_CONTROL_FC_ON |

View File

@ -74,6 +74,7 @@ struct atu_opt {
#define PSC_CONTROL 0x1
#define PSC_CONTROL_FORCED_SPD (1 << 13)
#define PSC_CONTROL_ALT_SPD (1 << 12)
#define PSC_CONTROL_EEE_ON (1 << 9)
#define PSC_CONTROL_FORCED_EEE (1 << 8)
#define PSC_CONTROL_FC_ON (1 << 7)