gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-09-02 15:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #351 from DrDoof/feat/lag-interface

Browse Source 
port: let a pvid name an aggregation group
This commit is contained in:
René van Dorst
2026-08-31 13:37:14 +02:00
committed by GitHub
parent 3c72f0e1b6 d405dd7776
commit b6d2d7c072
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtl837x_port.c
+25 -2
View File
@@ -87,10 +87,9 @@ vlan_ingress_mode_t port_ingress_filter_get(__xdata uint8_t port) __banked
/* /*
* Define a Primary VLAN ID for a port * Define a Primary VLAN ID for a port
*/ */
void port_pvid_set(uint8_t port, __xdata uint16_t pvid) __banked static void port_pvid_write(uint8_t port, __xdata uint16_t pvid)
{ {
// r4e1c:00001001 R4e1c-000017d0 r6738:00000000 R6738-00000000 (no filtering) // r4e1c:00001001 R4e1c-000017d0 r6738:00000000 R6738-00000000 (no filtering)
print_string("\nport_pvid_set called \n");
uint16_t reg = RTL837x_PVID_BASE_REG + ((port >> 1) << 2); uint16_t reg = RTL837x_PVID_BASE_REG + ((port >> 1) << 2);
reg_read_m(reg); reg_read_m(reg);
@@ -101,6 +100,22 @@ void port_pvid_set(uint8_t port, __xdata uint16_t pvid) __banked
} }
} }
void port_pvid_set(uint8_t port, __xdata uint16_t pvid) __banked
{
uint8_t lag = port_lag_of(port);
print_string("\nport_pvid_set called \n");
if (lag == PORT_LAG_NONE) {
port_pvid_write(port, pvid);
return;
}
uint16_t members = port_lag_members_get(lag);
for (uint8_t i = 0; i < 10; i++)
if ((members >> i) & 1)
port_pvid_write(i, pvid);
}
uint16_t port_pvid_get(uint8_t port) __banked uint16_t port_pvid_get(uint8_t port) __banked
{ {
uint16_t reg = RTL837x_PVID_BASE_REG + ((port >> 1) << 2); uint16_t reg = RTL837x_PVID_BASE_REG + ((port >> 1) << 2);
@@ -742,6 +757,14 @@ uint16_t port_lag_members_get(uint8_t lag) __banked
return ((uint16_t)SFR_DATA_8 << 8) | SFR_DATA_0; return ((uint16_t)SFR_DATA_8 << 8) | SFR_DATA_0;
} }
uint8_t port_lag_of(uint8_t port) __banked
{
for (uint8_t lag = 0; lag < 4; lag++)
if ((port_lag_members_get(lag) >> port) & 1)
return lag;
return PORT_LAG_NONE;
}
/* /*
* Configure LAGs * Configure LAGs
rtl837x_port.h
+2
View File
@@ -63,6 +63,8 @@ void port_mirror_del(void) __banked;
bool port_ingress_filter(__xdata uint8_t port, __xdata vlan_ingress_mode_t type) __banked; bool port_ingress_filter(__xdata uint8_t port, __xdata vlan_ingress_mode_t type) __banked;
void port_l2_setup(void) __banked; void port_l2_setup(void) __banked;
uint16_t port_lag_members_get(uint8_t lag) __banked; uint16_t port_lag_members_get(uint8_t lag) __banked;
#define PORT_LAG_NONE 0xff
uint8_t port_lag_of(uint8_t port) __banked;
void port_lag_members_set(__xdata uint8_t lag, __xdata uint16_t members) __banked; void port_lag_members_set(__xdata uint8_t lag, __xdata uint16_t members) __banked;
void port_lag_hash_set(__xdata uint8_t lag, __xdata uint8_t hash) __banked; void port_lag_hash_set(__xdata uint8_t lag, __xdata uint8_t hash) __banked;
void port_eee_enable_all(__xdata uint8_t speed) __banked; void port_eee_enable_all(__xdata uint8_t speed) __banked;