From patchwork Fri Jul 28 02:51:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 127288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp157292vqg; Thu, 27 Jul 2023 20:06:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlGNSfsQKoMt98ZdGkDJH4UZ90LnDsIe7Oy+dQuMCst8hpds3vcSGeLOxYJojBhh4VnSjKgp X-Received: by 2002:a17:903:186:b0:1bb:9efe:b1be with SMTP id z6-20020a170903018600b001bb9efeb1bemr740370plg.30.1690513570034; Thu, 27 Jul 2023 20:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690513570; cv=none; d=google.com; s=arc-20160816; b=v6Yh+aud6Kx/IHCGernDJ+wBpULJ8vTGBFydzs6YtmJo6qsWZZIdmkG1BEHx3wVCgm R6JoM2+6SUU1EHpDRpeaF/3XJi9tcwC0NI8XQ3LRMzPPf1ZDbEOM+wkyuMrFeESz6347 igNtERR5+HG24PGUhkvxAA9fZOizCu53xMdSIjPJwshxTWZOCHbt+BsZvN61X43NFLs+ rpuKHBgoZGBRIcYxNq1dowAk2dldlfAyUHRCZHH8Ybcn+SfS//Pjn37XDpeCNd5Ncm/w Uup9aiV9utMyKhRTZqc3m6kjtX3O2IluHGiIzWZ2MttlZ83QyIyN+PGmr8V7Di8w5lAY lz+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date; bh=NVcNsBAKcguHf60VNyFKcf1SSOWeVwHfHYiRahrpzP4=; fh=6uHf4Rb4DHDahIqS26h0Nic47hqd8K43WIkuK37Vo4Y=; b=WyKNDq2yT8WhM0gfUiLegqLBgZeUy98688G4XC/HfirgQgmwvZ3fOf2Poa2fSg/llg mTgBt1icTTzNp22MrL0jP2i+NEqNFyef4yUJz5QRhr3MFDHF2tjNG874v+0fGDFVB5Tw SCnSQjaBZuQYODShfy3zSAWbWGQH0n9nsLv28sEtEAJofic9AaQWEWjljPc6bgZg5jUY g5PhH6DbLC/P94xYQeq1A/JScyD3UFjVWEwEmLfnXR9F+Lnd3xVJtzgE8icsdpv6jdVu iDyDXG44wvsUgo32x658D8tHmRsSLWLjsdD3WghPTdyZK45+LiuquJd+/0Xe74Rv+RPb P+Tg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u8-20020a17090341c800b001b8987f4004si2274926ple.541.2023.07.27.20.05.35; Thu, 27 Jul 2023 20:06:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232666AbjG1Cvk (ORCPT + 99 others); Thu, 27 Jul 2023 22:51:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229786AbjG1Cvi (ORCPT ); Thu, 27 Jul 2023 22:51:38 -0400 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4D4B2686; Thu, 27 Jul 2023 19:51:32 -0700 (PDT) Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1qPDZc-000096-2m; Fri, 28 Jul 2023 02:51:24 +0000 Date: Fri, 28 Jul 2023 03:51:16 +0100 From: Daniel Golle To: Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Shayne Chen , Sean Wang , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 2/2] wifi: mt76: support per-band MAC addresses from OF child nodes Message-ID: <4958730e4f88b91442fa96365785d467fad502de.1690512516.git.daniel@makrotopia.org> References: <6e9cfac5758dd06429fadf6c1c70c569c86f3a95.1690512516.git.daniel@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <6e9cfac5758dd06429fadf6c1c70c569c86f3a95.1690512516.git.daniel@makrotopia.org> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772631957080021759 X-GMAIL-MSGID: 1772631957080021759 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"; }; }; Signed-off-by: Daniel Golle --- drivers/net/wireless/mediatek/mt76/eeprom.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c index 36564930aef12..c2b3386cada1c 100644 --- a/drivers/net/wireless/mediatek/mt76/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c @@ -161,9 +161,25 @@ 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 *np = dev->dev->of_node, *band_np; + bool found_mac = false; + u32 reg; + int ret; + + for_each_child_of_node(np, band_np) { + ret = of_property_read_u32(band_np, "reg", ®); + if (ret) + continue; + + if (reg == phy->band_idx) { + found_mac = !of_get_mac_address(band_np, phy->macaddr); + of_node_put(band_np); + break; + } + } - of_get_mac_address(np, phy->macaddr); + if (!found_mac) + of_get_mac_address(np, phy->macaddr); if (!is_valid_ether_addr(phy->macaddr)) { eth_random_addr(phy->macaddr);