Skip to contentSkip to conversation

wifi: mt76: support per-band MAC addresses from OF child nodes

PATCH In review Daniel Golle 3 participants 3 messages Jul 13, 2023 – Jul 26, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wifi: mt76: support per-band MAC addresses from OF child nodes

With dual-band-dual-congruent front-ends which appear as two independent radios it is desirable to assign a per-band MAC address from device-tree, eg. using nvmem-cells.
Support specifying MAC-address related properties in band-specific child nodes, e.g.

        mt7915@0,0 {
                reg = <0x0000 0 0 0 0>;
                #addr-cells = <1>;
                #size-cells = <0>;

                band@0 {
                        /* 2.4 GHz */
                        reg = <0>;
                        nvmem-cells = <&macaddr 2>;
                        nvmem-cell-names = "mac-address";
                };

                band@1 {
                        /* 5 GHz */
                        reg = <1>;
                        nvmem-cells = <&macaddr 3>;
                        nvmem-cell-names = "mac-address";
                };
        };
---
 drivers/net/wireless/mediatek/mt76/eeprom.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +14 -1
index dce851d42e083..90ee138843a55 100644
@@ -106,7 +106,20 @@ void
 mt76_eeprom_override(struct mt76_phy *phy)
 {
 	struct mt76_dev *dev = phy->dev;
-	struct device_node *np = dev->dev->of_node;
+	struct device_node *child_np, *np = dev->dev->of_node;
+	u32 reg;
+	int ret;
+
+	for_each_child_of_node(np, child_np) {
+		ret = of_property_read_u32(child_np, "reg", &reg);
+		if (ret)
+			continue;
+
+		if (reg == phy->band_idx) {
+			np = child_np;
+			break;
+		}
+	}
 
 	of_get_mac_address(np, phy->macaddr);
 
Signature · 1 line
2.41.0
#2 lore raw
In reply to Daniel Golle

Hi,

Quoted 42 lines · Daniel Golle

With dual-band-dual-congruent front-ends which appear as two independent radios it is desirable to assign a per-band MAC address from device-tree, eg. using nvmem-cells.
Support specifying MAC-address related properties in band-specific child nodes, e.g.

        mt7915@0,0 {
                reg = <0x0000 0 0 0 0>;
                #addr-cells = <1>;
                #size-cells = <0>;

                band@0 {
                        /* 2.4 GHz */
                        reg = <0>;
                        nvmem-cells = <&macaddr 2>;
                        nvmem-cell-names = "mac-address";
                };

                band@1 {
                        /* 5 GHz */
                        reg = <1>;
                        nvmem-cells = <&macaddr 3>;
                        nvmem-cell-names = "mac-address";
                };
        };
---
 drivers/net/wireless/mediatek/mt76/eeprom.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +2 -1
index dce851d42e083..90ee138843a55 100644
@@ -106,7 +106,20 @@ void
 mt76_eeprom_override(struct mt76_phy *phy)
 {
        struct mt76_dev *dev = phy->dev;
-       struct device_node *np = dev->dev->of_node;
+       struct device_node *child_np, *np = dev->dev->of_node;
+       u32 reg;

drivers/net/wireless/mediatek/mt76/eeprom.c void · line 120

Quoted 10 lines
drivers/net/wireless/mediatek/mt76/eeprom.c +10 -0
+       int ret;
+
+       for_each_child_of_node(np, child_np) {
+               ret = of_property_read_u32(child_np, "reg", &reg);
+               if (ret)
+                       continue;
+
+               if (reg == phy->band_idx) {
+                       np = child_np;
+                       break;

When breaking out of the loop here you still hold an additional reference to child_np, so you need to call of_node_put() for it, probably after calling of_get_mac_address().

drivers/net/wireless/mediatek/mt76/eeprom.c void · line 125

Quoted 5 lines
drivers/net/wireless/mediatek/mt76/eeprom.c +2 -0
+               }
+       }
 
        of_get_mac_address(np, phy->macaddr);
 

probably just add a of_node_put(child_np); here, of_node_put() seems to be NULL safe.

Regards,
Jonas