From patchwork Thu Dec 14 15:39:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10112559 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 863646019C for ; Thu, 14 Dec 2017 15:39:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 782FF28210 for ; Thu, 14 Dec 2017 15:39:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CAF02939B; Thu, 14 Dec 2017 15:39:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18F3228210 for ; Thu, 14 Dec 2017 15:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753428AbdLNPjd (ORCPT ); Thu, 14 Dec 2017 10:39:33 -0500 Received: from nbd.name ([46.4.11.11]:45550 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753335AbdLNPjV (ORCPT ); Thu, 14 Dec 2017 10:39:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4qL5mfO+X4M+ICxb5YB5YiJGRgITRqcei4piww+ONU4=; b=uhv+0fZslDSaXBG6Hbaaezvo3V XKhoY7LNyHsFlI6IpKhe0buWzNT4udWvxzQzEPbQW+L2IWBBHy7t4pClSyWUWRQdVEf7j4t8KTovk 17HfIg3EiqPFqL1n4U1UKZVZWAOZ8DnxyO6S6X55yJ3CqIbqiietlqC1q95KmTGv1ywY=; Received: by maeck.local (Postfix, from userid 501) id 2C48F94D129; Thu, 14 Dec 2017 16:39:19 +0100 (CET) From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org Subject: [PATCH 10/14] mt76x2: clean up MAC/BSSID address initialization Date: Thu, 14 Dec 2017 16:39:14 +0100 Message-Id: <20171214153918.43774-11-nbd@nbd.name> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171214153918.43774-1-nbd@nbd.name> References: <20171214153918.43774-1-nbd@nbd.name> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Drop the use of the EEPROM address entirely, rely on interface address only Signed-off-by: Felix Fietkau --- drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 11 ++++------- drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c index ac4eeaf2c993..f54dc67a13d0 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c @@ -231,7 +231,6 @@ mt76x2_init_beacon_offsets(struct mt76x2_dev *dev) int mt76x2_mac_reset(struct mt76x2_dev *dev, bool hard) { static const u8 null_addr[ETH_ALEN] = {}; - const u8 *macaddr = dev->mt76.macaddr; u32 val; int i, k; @@ -271,13 +270,11 @@ int mt76x2_mac_reset(struct mt76x2_dev *dev, bool hard) mt76_wr(dev, MT_MCU_CLOCK_CTL, 0x1401); mt76_clear(dev, MT_FCE_L2_STUFF, MT_FCE_L2_STUFF_WR_MPDU_LEN_EN); - mt76_wr(dev, MT_MAC_ADDR_DW0, get_unaligned_le32(macaddr)); - mt76_wr(dev, MT_MAC_ADDR_DW1, get_unaligned_le16(macaddr + 4)); + mt76_wr(dev, MT_MAC_ADDR_DW0, 0); + mt76_wr(dev, MT_MAC_ADDR_DW1, 0); - mt76_wr(dev, MT_MAC_BSSID_DW0, get_unaligned_le32(macaddr)); - mt76_wr(dev, MT_MAC_BSSID_DW1, get_unaligned_le16(macaddr + 4) | - FIELD_PREP(MT_MAC_BSSID_DW1_MBSS_MODE, 3) | /* 8 beacons */ - MT_MAC_BSSID_DW1_MBSS_LOCAL_BIT); + mt76_wr(dev, MT_MAC_BSSID_DW0, 0); + mt76_wr(dev, MT_MAC_BSSID_DW1, 0); mt76_set(dev, MT_MAC_ADDR_EXT_CTL, MT_MAC_ADDR_EXT_CTL_EN); diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c index 60cee4abed7c..d2ae093b7092 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c @@ -27,6 +27,15 @@ void mt76x2_mac_set_bssid(struct mt76x2_dev *dev, u8 idx, const u8 *addr) if (addr) { lo = get_unaligned_le32(addr); hi = get_unaligned_le16(addr + 4); + + if (!idx) { + mt76_wr(dev, MT_MAC_BSSID_DW0, lo); + + mt76_rmw_field(dev, MT_MAC_BSSID_DW1, + MT_MAC_BSSID_DW1_ADDR, + hi); + } + hi |= MT_MAC_APC_BSSID0_H_EN; } @@ -41,6 +50,11 @@ void mt76x2_mac_set_ext_mac(struct mt76x2_dev *dev, u8 idx, const u8 *addr) if (addr) { lo = get_unaligned_le32(addr); hi = get_unaligned_le16(addr + 4); + + if (!idx) { + mt76_wr(dev, MT_MAC_ADDR_DW0, lo); + mt76_wr(dev, MT_MAC_ADDR_DW1, hi); + } } mt76_wr(dev, MT_MAC_ADDR_EXT_L(idx), lo);