Skip to contentSkip to conversation

mt7601u: update mac addr if different from eeprom one

PATCH In review Lorenzo Bianconi 3 participants 8 messages Feb 8, 2018 – Feb 28, 2018

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

cover mt7601u: update mac addr if different from eeprom one

Lorenzo Bianconi (2):
mt7601u: move mt7601u_set_macaddr in mac related code
mt7601u: set device mac address in mt7601u_add_interface()

 drivers/net/wireless/mediatek/mt7601u/eeprom.c | 24 ++----------------------
 drivers/net/wireless/mediatek/mt7601u/mac.c    | 16 ++++++++++++++++
 drivers/net/wireless/mediatek/mt7601u/mac.h    |  1 +
 drivers/net/wireless/mediatek/mt7601u/main.c   |  3 +++
 4 files changed, 22 insertions(+), 22 deletions(-)
Signature · 1 line
2.14.3
#1 lore raw

PATCH 1/2 mt7601u: move mt7601u_set_macaddr in mac related code

Remove static qualifier from mt7601u_set_macaddr routine and move it in mac related code in order to be used to properly support vif with different mac address respect to the default one

---
 drivers/net/wireless/mediatek/mt7601u/eeprom.c | 24 ++----------------------
 drivers/net/wireless/mediatek/mt7601u/mac.c    | 16 ++++++++++++++++
 drivers/net/wireless/mediatek/mt7601u/mac.h    |  1 +
 3 files changed, 19 insertions(+), 22 deletions(-)
drivers/net/wireless/mediatek/mt7601u/eeprom.c +2 -22
index da6faea092d6..05d729be0c65 100644
@@ -19,6 +19,7 @@
 #include <asm/unaligned.h>
 #include "mt7601u.h"
 #include "eeprom.h"
+#include "mac.h"
 
 static bool
 field_valid(u8 val)
@@ -134,27 +135,6 @@ mt7601u_set_chip_cap(struct mt7601u_dev *dev, u8 *eeprom)
 			"Error: device has more than 1 RX/TX stream!\n");
 }
 
-static int
-mt7601u_set_macaddr(struct mt7601u_dev *dev, const u8 *eeprom)
-{
-	const void *src = eeprom + MT_EE_MAC_ADDR;
-
-	ether_addr_copy(dev->macaddr, src);
-
-	if (!is_valid_ether_addr(dev->macaddr)) {
-		eth_random_addr(dev->macaddr);
-		dev_info(dev->dev,
-			 "Invalid MAC address, using random address %pM\n",
-			 dev->macaddr);
-	}
-
-	mt76_wr(dev, MT_MAC_ADDR_DW0, get_unaligned_le32(dev->macaddr));
-	mt76_wr(dev, MT_MAC_ADDR_DW1, get_unaligned_le16(dev->macaddr + 4) |
-		FIELD_PREP(MT_MAC_ADDR_DW1_U2ME_MASK, 0xff));
-
-	return 0;
-}
-
 static void mt7601u_set_channel_target_power(struct mt7601u_dev *dev,
 					     u8 *eeprom, u8 max_pwr)
 {
@@ -400,7 +380,7 @@ mt7601u_eeprom_init(struct mt7601u_dev *dev)
 	dev_info(dev->dev, "EEPROM ver:%02hhx fae:%02hhx\n",
 		 eeprom[MT_EE_VERSION_EE], eeprom[MT_EE_VERSION_FAE]);
 
-	mt7601u_set_macaddr(dev, eeprom);
+	mt7601u_set_macaddr(dev, eeprom + MT_EE_MAC_ADDR);
 	mt7601u_set_chip_cap(dev, eeprom);
 	mt7601u_set_channel_power(dev, eeprom);
 	mt7601u_set_country_reg(dev, eeprom);
drivers/net/wireless/mediatek/mt7601u/mac.c +16 -0
index d6dc59bb00df..4d3077941138 100644
@@ -16,6 +16,22 @@
 #include "trace.h"
 #include <linux/etherdevice.h>
 
+void mt7601u_set_macaddr(struct mt7601u_dev *dev, const u8 *addr)
+{
+	ether_addr_copy(dev->macaddr, addr);
+
+	if (!is_valid_ether_addr(dev->macaddr)) {
+		eth_random_addr(dev->macaddr);
+		dev_info(dev->dev,
+			 "Invalid MAC address, using random address %pM\n",
+			 dev->macaddr);
+	}
+
+	mt76_wr(dev, MT_MAC_ADDR_DW0, get_unaligned_le32(dev->macaddr));
+	mt76_wr(dev, MT_MAC_ADDR_DW1, get_unaligned_le16(dev->macaddr + 4) |
+		FIELD_PREP(MT_MAC_ADDR_DW1_U2ME_MASK, 0xff));
+}
+
 static void
 mt76_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate)
 {
drivers/net/wireless/mediatek/mt7601u/mac.h +1 -0
index 2c22d63c63a2..b7aa24656d0e 100644
@@ -174,5 +174,6 @@ u16 mt76_mac_tx_rate_val(struct mt7601u_dev *dev,
 struct mt76_tx_status
 mt7601u_mac_fetch_tx_status(struct mt7601u_dev *dev);
 void mt76_send_tx_status(struct mt7601u_dev *dev, struct mt76_tx_status *stat);
+void mt7601u_set_macaddr(struct mt7601u_dev *dev, const u8 *addr);
 
 #endif
Signature · 1 line
2.14.3
#2 lore raw

Re: [1/2] mt7601u: move mt7601u_set_macaddr in mac related code

Quoted 5 lines · Lorenzo Bianconi

Remove static qualifier from mt7601u_set_macaddr routine and move it in mac related code in order to be used to properly support vif with different mac address respect to the default one

2 patches applied to wireless-drivers-next.git, thanks.

e96826bde3db mt7601u: move mt7601u_set_macaddr in mac related code 032a552e8dc9 mt7601u: set device mac address in mt7601u_add_interface()

Signature · 3 lines
https://patchwork.kernel.org/patch/10208071/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#3 lore raw

PATCH 2/2 mt7601u: set device mac address in mt7601u_add_interface()

In reply to Lorenzo Bianconi

If mac80211 adds a vif with a different mac address respect to the eeprom one, the device will not be able to connect to the ap since the hw address has not been updated.
Fix the issue updating hw mac address in mt7601u_add_interface routine

---
 drivers/net/wireless/mediatek/mt7601u/main.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt7601u/main.c +3 -0
index 43ebd460ba86..3c9ea40d9584 100644
@@ -64,6 +64,9 @@ static int mt7601u_add_interface(struct ieee80211_hw *hw,
 	 */
 	mvif->idx = idx;
 
+	if (!ether_addr_equal(dev->macaddr, vif->addr))
+		mt7601u_set_macaddr(dev, vif->addr);
+
 	if (dev->wcid_mask[wcid / BITS_PER_LONG] & BIT(wcid % BITS_PER_LONG))
 		return -ENOSPC;
 	dev->wcid_mask[wcid / BITS_PER_LONG] |= BIT(wcid % BITS_PER_LONG);
Signature · 1 line
2.14.3
#4 lore raw

Re: [PATCH 2/2] mt7601u: set device mac address in mt7601u_add_interface()

Quoted 16 lines · Lorenzo Bianconi

If mac80211 adds a vif with a different mac address respect to the eeprom one, the device will not be able to connect to the ap since the hw address has not been updated.
Fix the issue updating hw mac address in mt7601u_add_interface routine

---
 drivers/net/wireless/mediatek/mt7601u/main.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt7601u/main.c +0 -0
index 43ebd460ba86..3c9ea40d9584 100644

drivers/net/wireless/mediatek/mt7601u/main.c static int mt7601u_add_interface(struct ieee80211_hw *hw, · line 72

Quoted 9 lines
drivers/net/wireless/mediatek/mt7601u/main.c +3 -0
@@ -64,6 +64,9 @@ static int mt7601u_add_interface(struct ieee80211_hw *hw,
 	 */
 	mvif->idx = idx;
 
+	if (!ether_addr_equal(dev->macaddr, vif->addr))
+		mt7601u_set_macaddr(dev, vif->addr);
+
 	if (dev->wcid_mask[wcid / BITS_PER_LONG] & BIT(wcid % BITS_PER_LONG))
 		return -ENOSPC;
 	dev->wcid_mask[wcid / BITS_PER_LONG] |= BIT(wcid % BITS_PER_LONG);

Sorry, my recollection of mac80211 code is waning, but can't we have more than one vif as long as they are on the same channel?

#5 lore raw

Re: [PATCH 2/2] mt7601u: set device mac address in mt7601u_add_interface()

Quoted 20 lines · Jakub Kicinski
Quoted 19 lines · Lorenzo Bianconi

If mac80211 adds a vif with a different mac address respect to the eeprom one, the device will not be able to connect to the ap since the hw address has not been updated.
Fix the issue updating hw mac address in mt7601u_add_interface routine

---
 drivers/net/wireless/mediatek/mt7601u/main.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt7601u/main.c +0 -0
index 43ebd460ba86..3c9ea40d9584 100644
@@ -64,6 +64,9 @@ static int mt7601u_add_interface(struct ieee80211_hw *hw,
 	 */
 	mvif->idx = idx;
 
Quoted 9 lines

drivers/net/wireless/mediatek/mt7601u/main.c static int mt7601u_add_interface(struct ieee80211_hw *hw, · line 72

Quoted 6 lines
drivers/net/wireless/mediatek/mt7601u/main.c +3 -0
+	if (!ether_addr_equal(dev->macaddr, vif->addr))
+		mt7601u_set_macaddr(dev, vif->addr);
+
 	if (dev->wcid_mask[wcid / BITS_PER_LONG] & BIT(wcid % BITS_PER_LONG))
 		return -ENOSPC;
 	dev->wcid_mask[wcid / BITS_PER_LONG] |= BIT(wcid % BITS_PER_LONG);

Sorry, my recollection of mac80211 code is waning, but can't we have more than one vif as long as they are on the same channel?

Hi Jakub,

yep, you are right, but according to my understanding (please correct me if it is wrong) current implementation supports just one interface in sta mode (i.e. mvif->idx is always 0) so my patchset just fixes the issue highlighted in the bugzilla since I do not know if the hw supports multiple concurrent vifs in client mode. If so, I can extend the support to multiple client vifs if it is a way to properly configure the rx filters to allow reception from multiple mac addresses.

Regards,
Lorenzo

#6 lore raw

Re: [PATCH 2/2] mt7601u: set device mac address in mt7601u_add_interface()

Quoted 33 lines · Lorenzo Bianconi
Quoted 20 lines · Jakub Kicinski
Quoted 19 lines · Lorenzo Bianconi

If mac80211 adds a vif with a different mac address respect to the eeprom one, the device will not be able to connect to the ap since the hw address has not been updated.
Fix the issue updating hw mac address in mt7601u_add_interface routine

---
 drivers/net/wireless/mediatek/mt7601u/main.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt7601u/main.c +0 -0
index 43ebd460ba86..3c9ea40d9584 100644
@@ -64,6 +64,9 @@ static int mt7601u_add_interface(struct ieee80211_hw *hw,
 	 */
 	mvif->idx = idx;
 
Quoted 9 lines

drivers/net/wireless/mediatek/mt7601u/main.c static int mt7601u_add_interface(struct ieee80211_hw *hw, · line 72

Quoted 6 lines
drivers/net/wireless/mediatek/mt7601u/main.c +3 -0
+	if (!ether_addr_equal(dev->macaddr, vif->addr))
+		mt7601u_set_macaddr(dev, vif->addr);
+
 	if (dev->wcid_mask[wcid / BITS_PER_LONG] & BIT(wcid % BITS_PER_LONG))
 		return -ENOSPC;
 	dev->wcid_mask[wcid / BITS_PER_LONG] |= BIT(wcid % BITS_PER_LONG);  

Sorry, my recollection of mac80211 code is waning, but can't we have more than one vif as long as they are on the same channel?

Hi Jakub,

Quoted 7 lines

yep, you are right, but according to my understanding (please correct me if it is wrong) current implementation supports just one interface in sta mode (i.e. mvif->idx is always 0) so my patchset just fixes the issue highlighted in the bugzilla since I do not know if the hw supports multiple concurrent vifs in client mode. If so, I can extend the support to multiple client vifs if it is a way to properly configure the rx filters to allow reception from multiple mac addresses.

Ah, you're probably right, perhaps we would have one vif but multiple stas.

Acked-by on the v1 series
#7 lore raw
In reply to Lorenzo Bianconi
Quoted 10 lines · Lorenzo Bianconi

Lorenzo Bianconi (2):
mt7601u: move mt7601u_set_macaddr in mac related code
mt7601u: set device mac address in mt7601u_add_interface()

 drivers/net/wireless/mediatek/mt7601u/eeprom.c | 24 ++----------------------
 drivers/net/wireless/mediatek/mt7601u/mac.c    | 16 ++++++++++++++++
 drivers/net/wireless/mediatek/mt7601u/mac.h    |  1 +
 drivers/net/wireless/mediatek/mt7601u/main.c   |  3 +++
 4 files changed, 22 insertions(+), 22 deletions(-)