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

Cleanup and fix flushing of L2 UC entries

Browse Source
This commit is contained in:
logicog
2025-08-24 19:26:24 +02:00
parent 81b7e4fa87
commit ef742f8f19
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtl837x_common.h
+5
View File
@@ -7,6 +7,11 @@
// This has to be set to the number of SFP+ ports, i.e. 1 or 2 // This has to be set to the number of SFP+ ports, i.e. 1 or 2
#define NSFP 2 #define NSFP 2
// Define Port-masks for 9-port devices and 6-port devices
#define PMASK_9 0x1ff
#define PMASK_6 0x1f8
#define PMASK_CPU 0x200
// The serial buffer. Defines the command line size // The serial buffer. Defines the command line size
// Must be 2^x and <= 128 // Must be 2^x and <= 128
#define SBUF_SIZE 128 #define SBUF_SIZE 128
rtl837x_port.c
+20 -20
View File
@@ -253,19 +253,21 @@ void trunk_set(uint8_t group, uint16_t mask) __banked
uint8_t port_l2_forget(void) __banked uint8_t port_l2_forget(void) __banked
{ {
print_string("\nport_l2_forget called\n"); print_string("\nport_l2_forget called\n");
// r53dc:00000000 R53dc-00000000 r53d4:000001ff r53d4:000001ff R53d4-000101ff r53d4:000001ff // Configure the entries to be flushed:
reg_read_m(0x53dc); // port-based (bits 0-1 are 0 and dynamic entries, bit 2 specifies dynamic entries
if (sfr_data[0] || sfr_data[1] ||sfr_data[2] ||sfr_data[3]) { REG_SET(RTL837x_L2_TBL_FLUSH_CNF, 0x0);
print_string("List busy\n");
return 0xff;
}
REG_WRITE(0x53dc, sfr_data[0], sfr_data[1], sfr_data[2], sfr_data[3]);
reg_read_m(RTL837x_L2_TBL_CTRL); // Flush L2 table for all ports by setting the ports and the flush-exec bit (bit 16)
REG_WRITE(RTL837x_L2_TBL_CTRL, 0x00, 0x01, sfr_data[2], sfr_data[3]); if (isRTL8373) {
REG_SET(RTL837x_L2_TBL_FLUSH_CTRL, L2_TBL_FLUSH_EXEC | PMASK_9);
} else {
REG_SET(RTL837x_L2_TBL_FLUSH_CTRL, L2_TBL_FLUSH_EXEC | PMASK_6);
}
// Wait for flush completed
do { do {
reg_read_m(RTL837x_L2_TBL_CTRL); reg_read_m(RTL837x_L2_TBL_FLUSH_CTRL);
} while (sfr_data[1] & 0x1); } while (sfr_data[1]);
print_string("port_l2_forget done\n"); print_string("port_l2_forget done\n");
return 0; return 0;
@@ -345,21 +347,19 @@ void port_l2_learned(void) __banked
void port_l2_setup() __banked void port_l2_setup() __banked
{ {
print_string("\nport_l2_setup called\n"); print_string("\nport_l2_setup called\n");
REG_SET(0x53dc, 0x00000000);
if(isRTL8373) { port_l2_forget();
REG_SET(0x53d4, 0x000101ff);
} else {
REG_SET(0x53d4, 0x000001f8);
}
for (uint8_t i = minPort; i <= maxPort; i++) { for (uint8_t i = minPort; i <= maxPort; i++) {
uint16_t reg = 0x5384 + (i << 2); uint16_t reg = 0x5384 + (i << 2);
REG_SET(reg, 0x00001040); REG_SET(reg, 0x00001040);
reg = 0x50c0 + (i << 2); // All ports may communicate with each other and CPU-Port
reg = RTL837X_PORT_ISOLATION_BASE + (i << 2);
if(isRTL8373) { if(isRTL8373) {
REG_SET(reg, 0x3ff); REG_SET(reg, PMASK_9 | PMASK_CPU);
} else { } else {
REG_SET(reg, 0x3f8); REG_SET(reg, PMASK_6 | PMASK_CPU);
} }
} }
reg_bit_set(0x4f80, 0); reg_bit_set(0x4f80, 0);
rtl837x_regs.h
+4 -1
View File
@@ -105,9 +105,12 @@
#define RTL837x_L2_DATA_OUT_B 0x5cd0 #define RTL837x_L2_DATA_OUT_B 0x5cd0
#define RTL837x_L2_DATA_OUT_C 0x5cd4 #define RTL837x_L2_DATA_OUT_C 0x5cd4
#define RTL837x_TBL_DATA_IN_A 0x5cb8 #define RTL837x_TBL_DATA_IN_A 0x5cb8
#define RTL837x_L2_TBL_CTRL 0x53d4
#define RTL837x_PVID_BASE_REG 0x4e1c #define RTL837x_PVID_BASE_REG 0x4e1c
#define RTL837x_L2_TBL_FLUSH_CTRL 0x53d4
#define L2_TBL_FLUSH_EXEC 0x10000
#define RTL837x_L2_TBL_FLUSH_CNF 0x53dc
/* /*
* Egress / ingress filtering * Egress / ingress filtering
*/ */