| Message ID | 567a7cda15f641acb6eab5970370c9bfac96793e.1574548832.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 693d060536abca7b16d2fb8e66aa56be2a2443a2 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | mt76: mt76x0: fix default mac address overwrite | expand |
> Current implementation always use default eeprom mac address to > configure device registers even if it is updated using > mt76_eeprom_override. Fix it initializing macaddr filed of mt76_dev data > structure with eeprom mac address and running mt76_eeprom_override > before mt76x02_mac_setaddr > > Fixes: d1bc9bf2072c ("mt76: mt76x0: eeprom: add support for MAC address from OF") > Tested-by: Kevin Schmidt <kevin.patrick.schmidt@googlemail.com> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Hi Kalle, since the commit d1bc9bf2072c is already in Linus's tree and multiple users reported regression due this commit, could you please apply this patch in wireless-drivers tree? Regards, Lorenzo > --- > drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c > index a03e2d01fba7..d1405528b504 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c > @@ -342,8 +342,11 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev) > dev_info(dev->mt76.dev, "EEPROM ver:%02hhx fae:%02hhx\n", > version, fae); > > - mt76x02_mac_setaddr(dev, dev->mt76.eeprom.data + MT_EE_MAC_ADDR); > + memcpy(dev->mt76.macaddr, (u8 *)dev->mt76.eeprom.data + MT_EE_MAC_ADDR, > + ETH_ALEN); > mt76_eeprom_override(&dev->mt76); > + mt76x02_mac_setaddr(dev, dev->mt76.macaddr); > + > mt76x0_set_chip_cap(dev); > mt76x0_set_freq_offset(dev); > mt76x0_set_temp_offset(dev); > -- > 2.21.0 >
Lorenzo Bianconi <lorenzo@kernel.org> writes: >> Current implementation always use default eeprom mac address to >> configure device registers even if it is updated using >> mt76_eeprom_override. Fix it initializing macaddr filed of mt76_dev data >> structure with eeprom mac address and running mt76_eeprom_override >> before mt76x02_mac_setaddr >> >> Fixes: d1bc9bf2072c ("mt76: mt76x0: eeprom: add support for MAC address from OF") >> Tested-by: Kevin Schmidt <kevin.patrick.schmidt@googlemail.com> >> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > > Hi Kalle, > > since the commit d1bc9bf2072c is already in Linus's tree and multiple users > reported regression due this commit, could you please apply this patch in > wireless-drivers tree? Ok, I assigned this to me in patchwork and I'll queue this for v5.5.
On Dec 02, Kalle Valo wrote: > Lorenzo Bianconi <lorenzo@kernel.org> writes: > > >> Current implementation always use default eeprom mac address to > >> configure device registers even if it is updated using > >> mt76_eeprom_override. Fix it initializing macaddr filed of mt76_dev data > >> structure with eeprom mac address and running mt76_eeprom_override > >> before mt76x02_mac_setaddr > >> > >> Fixes: d1bc9bf2072c ("mt76: mt76x0: eeprom: add support for MAC address from OF") > >> Tested-by: Kevin Schmidt <kevin.patrick.schmidt@googlemail.com> > >> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > > > > Hi Kalle, > > > > since the commit d1bc9bf2072c is already in Linus's tree and multiple users > > reported regression due this commit, could you please apply this patch in > > wireless-drivers tree? > > Ok, I assigned this to me in patchwork and I'll queue this for v5.5. Thx. Regards, Lorenzo > > -- > https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches >
Lorenzo Bianconi <lorenzo@kernel.org> wrote: > Current implementation always use default eeprom mac address to > configure device registers even if it is updated using > mt76_eeprom_override. Fix it initializing macaddr filed of mt76_dev data > structure with eeprom mac address and running mt76_eeprom_override > before mt76x02_mac_setaddr > > Fixes: d1bc9bf2072c ("mt76: mt76x0: eeprom: add support for MAC address from OF") > Tested-by: Kevin Schmidt <kevin.patrick.schmidt@googlemail.com> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Patch applied to wireless-drivers.git, thanks. 693d060536ab mt76: mt76x0: fix default mac address overwrite
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c index a03e2d01fba7..d1405528b504 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c @@ -342,8 +342,11 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev) dev_info(dev->mt76.dev, "EEPROM ver:%02hhx fae:%02hhx\n", version, fae); - mt76x02_mac_setaddr(dev, dev->mt76.eeprom.data + MT_EE_MAC_ADDR); + memcpy(dev->mt76.macaddr, (u8 *)dev->mt76.eeprom.data + MT_EE_MAC_ADDR, + ETH_ALEN); mt76_eeprom_override(&dev->mt76); + mt76x02_mac_setaddr(dev, dev->mt76.macaddr); + mt76x0_set_chip_cap(dev); mt76x0_set_freq_offset(dev); mt76x0_set_temp_offset(dev);
Current implementation always use default eeprom mac address to configure device registers even if it is updated using mt76_eeprom_override. Fix it initializing macaddr filed of mt76_dev data structure with eeprom mac address and running mt76_eeprom_override before mt76x02_mac_setaddr Fixes: d1bc9bf2072c ("mt76: mt76x0: eeprom: add support for MAC address from OF") Tested-by: Kevin Schmidt <kevin.patrick.schmidt@googlemail.com> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)