Wifi wds

.gitignore

@@ -12,3 +12,4 @@ AGENTS.md
 /test/.log
 /local.mk
 /test/spec/Readme.adoc
+__pycache__/

board/aarch64/acer-connect-vero-w6m/rootfs/usr/share/product/acer,connect-vero-w/etc/factory-config.cfg

@@ -22,7 +22,6 @@
         "name": "radio0",
         "class": "infix-hardware:wifi",
         "infix-hardware:wifi-radio": {
-          "country-code": "DE",
           "band": "2.4GHz",
           "channel": "auto"
         }
@@ -31,7 +30,6 @@
         "name": "radio1",
         "class": "infix-hardware:wifi",
         "infix-hardware:wifi-radio": {
-          "country-code": "DE",
           "band": "6GHz",
           "channel": "auto"
         }
@@ -40,12 +38,14 @@
         "name": "radio2",
         "class": "infix-hardware:wifi",
         "infix-hardware:wifi-radio": {
-          "country-code": "DE",
           "band": "5GHz",
           "channel": "auto"
         }
       }
-    ]
+    ],
+    "infix-hardware:wifi": {
+      "country-code": "DE"
+    }
   },
   "ietf-interfaces:interfaces": {
     "interface": [
@@ -457,7 +457,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.10"
+    "version": "1.11"
   },
   "infix-services:mdns": {
     "enabled": true

board/aarch64/bananapi-bpi-r3/README.md

@@ -212,6 +212,36 @@ sync
 2. Set boot switches to eMMC mode (see image above)
 3. Power on
 
+## Giving the Board a Permanent MAC Address
+
+The BPI-R3 family has no EEPROM with a factory-programmed MAC address.
+Out of the box every Ethernet port therefore gets a random address on
+each boot, and the hostname, which is derived from the base address,
+changes with it.  Worse, both WiFi radios carry the same MediaTek
+default address on every board, so two boards cannot even connect to
+each other over WiFi: a client refuses to authenticate to an access
+point that has its own address.
+
+The eMMC image carries an empty `factory` partition for this purpose.
+Write a product record to it once, from the Infix shell, and the board
+keeps that identity across reboots and upgrades:
+
+```
+echo '{"mac-address":"02:00:00:ba:01:00","serial-number":"banana1","vendor":"Bananapi","product-name":"BPI-R3"}' \
+  | onieprom -e | dd of=/dev/disk/by-partlabel/factory
+```
+
+Give each board its own base address and serial number, then reboot.
+The base address becomes the hostname suffix, the wired ports get base
++ 1, base + 2, and so on in name order, and the WiFi interfaces get
+addresses derived from the base.  With the record above the board is
+named `bpi-ba-01-00`, `lan1` is `02:00:00:ba:01:02` and `wifi0` is
+`06:00:00:ba:01:00`.
+
+A locally administered address like `02:xx:xx:xx:xx:xx` is fine for a
+lab.  For boards that will share a network with other equipment, use a
+range you own.  See [Vital Product Data](../../../doc/vpd.md#factory-partition)
+for the record format and what else it can carry.
 
 ## Troubleshooting
 

board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi

@@ -1,4 +1,18 @@
 / {
+	/*
+	 * U-Boot writes its ethaddr, which it generates at random on
+	 * every boot, into the node behind the ethernet0 alias.  The
+	 * kernel then reports that port, and every switch port that
+	 * inherits from it, as having a permanent hardware address.
+	 * Drop the aliases so the ports come up with a random address
+	 * instead, which init.d/22-macaddr replaces with a chassis-
+	 * derived one when a product VPD is present.
+	 */
+	aliases {
+		/delete-property/ ethernet0;
+		/delete-property/ ethernet1;
+	};
+
 	chosen {
 		infix {
 			/* Default admin user password: 'admin' */

board/aarch64/bananapi-bpi-r3/rootfs/etc/modprobe.d/mt7915e-wed.conf

@@ -0,0 +1,2 @@
+# Wireless Ethernet Dispatch, the WiFi hardware offload path
+options mt7915e wed_enable=1

board/aarch64/bananapi-bpi-r3/rootfs/usr/libexec/bpi-r3/macaddr

@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+"""Give ports without a hardware MAC address a chassis-derived one.
+
+The BPI-R3 family has no MAC EEPROM, so every port boots with a random
+address, and the switch ports inherit that from their conduit.  When
+the product VPD provides a base MAC, hand each such port a stable
+address derived from it: base + 1, base + 2, ... in interface name
+order.  This mirrors what products with real hardware addresses get
+from their device tree.  Ports with a permanent address are left alone.
+
+Runs from /etc/product/init.d, before the DSA conduit is renamed, so
+it sorts as eth0 and takes base + 1.
+"""
+import json
+import os
+import subprocess
+import sys
+
+SYSTEM_JSON = "/run/system.json"
+NET = "/sys/class/net"
+NET_ADDR_PERM = 0
+
+
+def log(msg):
+    subprocess.run(["logger", "-k", "-p", "user.notice", "-t", "macaddr", msg],
+                   check=False)
+
+
+def vpd_base_mac():
+    try:
+        with open(SYSTEM_JSON, encoding="ascii") as f:
+            system = json.load(f)
+    except (OSError, ValueError):
+        return None
+
+    product = system.get("vpd", {}).get("product", {})
+    return product.get("data", {}).get("mac-address")
+
+
+def mac_add(mac, offset):
+    num = int(mac.replace(":", ""), 16) + offset
+    num %= 1 << 48
+    return ":".join(f"{(num >> 8 * i) & 0xff:02x}" for i in range(5, -1, -1))
+
+
+def read(path):
+    with open(path, encoding="ascii") as f:
+        return f.read().strip()
+
+
+def ports():
+    """Wired ports whose address the kernel did not get from hardware."""
+    for name in sorted(os.listdir(NET)):
+        path = os.path.join(NET, name)
+        if not os.path.exists(os.path.join(path, "device")):
+            continue
+        if os.path.exists(os.path.join(path, "phy80211")):
+            continue
+        try:
+            if int(read(os.path.join(path, "addr_assign_type"))) == NET_ADDR_PERM:
+                continue
+        except (OSError, ValueError):
+            continue
+
+        yield name
+
+
+def main():
+    base = vpd_base_mac()
+    if not base:
+        return 0
+
+    for offset, name in enumerate(ports(), start=1):
+        mac = mac_add(base, offset)
+        rc = subprocess.run(["ip", "link", "set", "dev", name, "address", mac],
+                            check=False)
+        if rc.returncode:
+            log(f"failed setting {name} address {mac}")
+            continue
+        log(f"{name}: {mac} (chassis + {offset})")
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg

@@ -22,7 +22,6 @@
         "name": "radio0",
         "class": "infix-hardware:wifi",
         "infix-hardware:wifi-radio": {
-          "country-code": "DE",
           "band": "2.4GHz",
           "channel": "auto"
         }
@@ -31,12 +30,14 @@
         "name": "radio1",
         "class": "infix-hardware:wifi",
         "infix-hardware:wifi-radio": {
-          "country-code": "DE",
           "band": "5GHz",
           "channel": "auto"
         }
       }
-    ]
+    ],
+    "infix-hardware:wifi": {
+      "country-code": "DE"
+    }
   },
   "ietf-interfaces:interfaces": {
     "interface": [
@@ -450,7 +451,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.10"
+    "version": "1.11"
   },
   "infix-services:mdns": {
     "enabled": true

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/product/init.d/S22-macaddr

@@ -0,0 +1 @@
+/usr/libexec/bpi-r3/macaddr

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3mini/etc/factory-config.cfg

@@ -22,7 +22,6 @@
         "name": "radio0",
         "class": "infix-hardware:wifi",
         "infix-hardware:wifi-radio": {
-          "country-code": "DE",
           "band": "2.4GHz",
           "channel": "auto"
         }
@@ -31,12 +30,14 @@
         "name": "radio1",
         "class": "infix-hardware:wifi",
         "infix-hardware:wifi-radio": {
-          "country-code": "DE",
           "band": "5GHz",
           "channel": "auto"
         }
       }
-    ]
+    ],
+    "infix-hardware:wifi": {
+      "country-code": "DE"
+    }
   },
   "ietf-interfaces:interfaces": {
     "interface": [
@@ -416,7 +417,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.10"
+    "version": "1.11"
   },
   "infix-services:mdns": {
     "enabled": true

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3mini/etc/product/init.d/S22-macaddr

@@ -0,0 +1 @@
+/usr/libexec/bpi-r3/macaddr

board/aarch64/bananapi-bpi-r3/uboot/mt7986-env.dtsi

@@ -13,7 +13,7 @@
                        fdt_addr_r = "0x43f00000";
                        kernel_addr_r = "0x44000000";
                        scriptaddr = "0x48000000";
-                       ramdisk_addr_r = "0x4A000000";
+                       ramdisk_addr_r = "0x50000000";
 
 		en8811h_fw_part = "0#en8811h_fw";
 		en8811h_fw_dm_dir = "EthMD32.dm.bin";

board/aarch64/bananapi-bpi-r4/rootfs/usr/share/product/bananapi,bpi-r4-2g5/etc/factory-config.cfg

@@ -374,7 +374,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.10"
+    "version": "1.11"
   },
   "infix-services:mdns": {
     "enabled": true

board/aarch64/bananapi-bpi-r4/rootfs/usr/share/product/bananapi,bpi-r4/etc/factory-config.cfg

@@ -366,7 +366,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.10"
+    "version": "1.11"
   },
   "infix-services:mdns": {
     "enabled": true

board/aarch64/bananapi-bpi-r64/rootfs/usr/share/product/bananapi,bpi-r64/etc/factory-config.cfg

@@ -15,12 +15,14 @@
         "name": "radio0",
         "class": "infix-hardware:wifi",
         "infix-hardware:wifi-radio": {
-          "country-code": "DE",
           "band": "2.4GHz",
           "channel": "auto"
         }
       }
-    ]
+    ],
+    "infix-hardware:wifi": {
+      "country-code": "DE"
+    }
   },
   "ietf-interfaces:interfaces": {
     "interface": [
@@ -408,7 +410,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.10"
+    "version": "1.11"
   },
   "infix-services:mdns": {
     "enabled": true

board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/factory-config.cfg

@@ -350,7 +350,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.10"
+    "version": "1.11"
   },
   "infix-services:mdns": {
     "enabled": true

board/aarch64/raspberrypi-rpi64/README.md

@@ -118,19 +118,19 @@ Then configure the WiFi interface using the keystore reference:
 
 ```
 admin@infix:/> configure
+admin@infix:/config/> set hardware wifi country-code US
 admin@infix:/config/> edit interface wifi0
 admin@infix:/config/interface/wifi0/> set ipv4 dhcp-client
-admin@infix:/config/interface/wifi0/> set wifi ssid YourNetworkName
-admin@infix:/config/interface/wifi0/> set wifi secret mywifi
-admin@infix:/config/interface/wifi0/> set wifi country-code US
+admin@infix:/config/interface/wifi0/> set wifi station ssid YourNetworkName
+admin@infix:/config/interface/wifi0/> set wifi station security secret mywifi
 admin@infix:/config/interface/wifi0/> leave
 ```
 
 > [!NOTE]
 > The WiFi password (8-63 characters) is stored securely in the keystore as
 > `mywifi` (or any name you choose), which is then referenced in the WiFi
-> configuration. The country-code must match your location for regulatory
-> compliance (e.g., US, SE, DE, JP).
+> configuration. The country code is one setting for all radios and must
+> match your location for regulatory compliance (e.g., US, SE, DE, JP).
 
 ### Touch Screen Support