From: Martin Kennedy Date: Mon, 22 Aug 2022 00:37:18 +0000 (-0400) Subject: x86: setup netdev paths for MX100 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eb425f9ec9a276a0013db06faa076e4ae9640a7d;p=openwrt%2Fstaging%2Fblocktrron.git x86: setup netdev paths for MX100 The Meraki MX100 has ten 1000BASE-T and 2 SFP ethernet ports through 3, 4-port PCIe devices. The default enumeration of these network devices' names does not correspond to their labeling. Fix this by explicitly naming the devices, mapping against their sysfs path. Note that these default network names can only be up to 8 characters, because we can have up to 8 characters of modifiers (e.g. ^br-, .4096$), and because the maximum network interface name is 16 characters long. Signed-off-by: Martin Kennedy [lowercase subject] Signed-off-by: Paul Spooren --- diff --git a/target/linux/x86/base-files/etc/board.d/02_network b/target/linux/x86/base-files/etc/board.d/02_network index e4451461db..9335e297ba 100644 --- a/target/linux/x86/base-files/etc/board.d/02_network +++ b/target/linux/x86/base-files/etc/board.d/02_network @@ -9,7 +9,19 @@ board_config_update case "$(board_name)" in cisco-mx100-hw) - ucidef_set_interfaces_lan_wan "eth0 eth1 eth2 eth3 eth4 eth5 eth7 eth8 eth9 eth10 eth11" "eth6" + ucidef_set_network_device_path "mgmt" "pci0000:00/0000:00:01.2/0000:03:00.3" + ucidef_set_network_device_path "wan" "pci0000:00/0000:00:01.2/0000:03:00.2" + ucidef_set_network_device_path "eth2" "pci0000:00/0000:00:01.2/0000:03:00.1" + ucidef_set_network_device_path "eth3" "pci0000:00/0000:00:01.2/0000:03:00.0" + ucidef_set_network_device_path "eth4" "pci0000:00/0000:00:01.0/0000:01:00.2" + ucidef_set_network_device_path "eth5" "pci0000:00/0000:00:01.0/0000:01:00.1" + ucidef_set_network_device_path "eth6" "pci0000:00/0000:00:01.0/0000:01:00.4" + ucidef_set_network_device_path "eth7" "pci0000:00/0000:00:01.0/0000:01:00.3" + ucidef_set_network_device_path "eth8" "pci0000:00/0000:00:01.1/0000:02:00.1" + ucidef_set_network_device_path "eth9" "pci0000:00/0000:00:01.1/0000:02:00.0" + ucidef_set_network_device_path "eth10" "pci0000:00/0000:00:01.1/0000:02:00.3" + ucidef_set_network_device_path "eth11" "pci0000:00/0000:00:01.1/0000:02:00.2" + ucidef_set_interfaces_lan_wan "mgmt eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 eth11" "wan" ;; pc-engines-apu1|pc-engines-apu2|pc-engines-apu3) ucidef_set_interfaces_lan_wan "eth1 eth2" "eth0"