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

fix: initialize CPU MAC9 VLAN state independently of user port count

Browse Source
This commit is contained in:
avicarmeli committed 2026-10-12 10:43:42 +03:00
1 parent da7909f422
commit 875933b9f9
4 files changed
+48 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/cpu_vlan.mk
+10
View File
@@ -0,0 +1,10 @@
# Invoke: make -C test -f Makefile -f cpu_vlan.mk run-cpu-vlan
CPU_TESTS=build/test_cpu_vlan_full build/test_cpu_vlan_restricted build/test_cpu_vlan_8372
build/test_cpu_vlan_full: test_cpu_vlan.c $(TABLE_ENV) | build
$(CC) $(CFLAGS) -no-pie $(filter %.c,$^) -o $@ $(LDFLAGS)
build/test_cpu_vlan_restricted: test_cpu_vlan.c $(TABLE_ENV) | build
$(CC) $(CFLAGS) -no-pie -DRTLP_TEST_MAX_PORT=7 $(filter %.c,$^) -o $@ $(LDFLAGS)
build/test_cpu_vlan_8372: test_cpu_vlan.c $(TABLE_ENV) | build
$(CC) $(CFLAGS) -no-pie -DRTLP_TEST_MAX_PORT=7 -DRTLP_TEST_MIN_PORT=3 -DRTLP_TEST_IS8373=0 $(filter %.c,$^) -o $@ $(LDFLAGS)
run-cpu-vlan: $(CPU_TESTS)
@for t in $(CPU_TESTS); do $$t || exit 1; done
test/env_tables.c
+12 -3
View File
@@ -56,15 +56,24 @@ const uint8_t hex_chars[] = "0123456789abcdef";
uint8_t *hex = (uint8_t *)hex_chars;
/* ---- a 9-port RTL8373 whose logical ports map to themselves ---- */
#ifndef RTLP_TEST_MAX_PORT
#define RTLP_TEST_MAX_PORT 8
#endif
#ifndef RTLP_TEST_MIN_PORT
#define RTLP_TEST_MIN_PORT 0
#endif
#ifndef RTLP_TEST_IS8373
#define RTLP_TEST_IS8373 1
#endif
const struct machine machine = {
.machine_name = "HOSTTEST",
.min_port = 0,
.max_port = 8,
.min_port = RTLP_TEST_MIN_PORT,
.max_port = RTLP_TEST_MAX_PORT,
.n_sfp = 0,
.log_to_phys_port = { 1, 2, 3, 4, 5, 6, 7, 8, 9 },
.phys_to_log_port = { 0, 1, 2, 3, 4, 5, 6, 7, 8 },
};
struct machine_runtime machine_detected = { .isRTL8373 = 1 };
struct machine_runtime machine_detected = { .isRTL8373 = RTLP_TEST_IS8373 };
/* ---- firmware state the modules read or write ---- */
uint8_t outbuf[TCP_OUTBUF_SIZE];
test/test_cpu_vlan.c
+24
View File
@@ -0,0 +1,24 @@
#include <stdint.h>
#include <stdio.h>
#include "rtl837x_common.h"
#include "rtl837x_port.h"
#include "machine.h"
#include "support.h"
#include "hw_mock.h"
extern const struct machine machine;
extern struct machine_runtime machine_detected;
int main(void) {
hw_reset();out_reset();
hw_reg_set(RTL837X_VLAN_PORT_EGR_TAG,0xa50fffff);
hw_reg_set(RTL837x_PVID_BASE_REG+16,0x5a123456);
vlan_setup();
uint32_t untouched=(1u<<(machine.min_port*2))-1;
CHECK(hw_reg_get(RTL837X_VLAN_PORT_EGR_TAG)==(0xa5000000|untouched),"CPU egress set, unrelated bits preserved");
CHECK(hw_reg_get(RTL837x_PVID_BASE_REG+16)==0x5a001001,"CPU PVID initialized explicitly");
uint16_t active=((1u<<(machine.max_port+1))-1)&~((1u<<machine.min_port)-1);
CHECK(hw_reg_get(RTL837X_VLAN_PORT_IGR_FLTR)==(active|PMASK_CPU),"CPU ingress included, excluded user ports rejected");
CHECK(hw_vlan_word(1)==(machine_detected.isRTL8373?0x0207ffff:0x0207e3f8),"existing family VLAN membership preserved");
CHECK(hw_vlan_word(2)==0,"no unrelated VLAN changed");
printf("CPU VLAN min=%u max=%u RTL8373=%u: %d checks, %d failed\n",machine.min_port,machine.max_port,machine_detected.isRTL8373,tests_run,tests_failed);
return tests_failed?1:0;
}