From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2B7EC282C3 for ; Thu, 24 Jan 2019 16:24:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA403218A2 for ; Thu, 24 Jan 2019 16:24:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727918AbfAXQY4 (ORCPT ); Thu, 24 Jan 2019 11:24:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37246 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727765AbfAXQY4 (ORCPT ); Thu, 24 Jan 2019 11:24:56 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9814C13AC11; Thu, 24 Jan 2019 16:24:56 +0000 (UTC) Received: from localhost (unknown [10.43.2.219]) by smtp.corp.redhat.com (Postfix) with ESMTP id 360846607E; Thu, 24 Jan 2019 16:24:53 +0000 (UTC) Date: Thu, 24 Jan 2019 17:20:41 +0100 From: Stanislaw Gruszka To: Lorenzo Bianconi Cc: Felix Fietkau , linux-wireless@vger.kernel.org Subject: Re: [PATCH 1/7] mt76x02: use mask for vifs Message-ID: <20190124162040.GA5136@redhat.com> References: <1548344649-10404-1-git-send-email-sgruszka@redhat.com> <1548344649-10404-2-git-send-email-sgruszka@redhat.com> <20190124161235.GA10806@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190124161235.GA10806@localhost.localdomain> User-Agent: Mutt/1.5.20 (2009-12-10) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 24 Jan 2019 16:24:56 +0000 (UTC) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Thu, Jan 24, 2019 at 05:12:37PM +0100, Lorenzo Bianconi wrote: > > Use vif_mask to count interfaces to allow to set mac address > > if there is only one interface and support more STA vifs in > > the future. > > > > Signed-off-by: Stanislaw Gruszka > > --- > > drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 ++ > > drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 18 +++++++++++++----- > > 2 files changed, 15 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h > > index 6d96766a6ed3..be077443bdb0 100644 > > --- a/drivers/net/wireless/mediatek/mt76/mt76x02.h > > +++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h > > @@ -73,6 +73,8 @@ struct mt76x02_dev { > > > > struct mutex phy_mutex; > > > > + u16 vif_mask; > > + > > u8 txdone_seq; > > DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status); > > > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c > > index 062614ad0d51..1a949453dc25 100644 > > --- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c > > +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c > > @@ -288,10 +288,7 @@ void mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif, > > mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) > > { > > struct mt76x02_dev *dev = hw->priv; > > - unsigned int idx = 0; > > - > > - if (vif->addr[0] & BIT(1)) > > - idx = 1 + (((dev->mt76.macaddr[0] ^ vif->addr[0]) >> 2) & 7); > > + unsigned int idx, offset = 0; > > > > /* > > * Client mode typically only has one configurable BSSID register, > > @@ -307,7 +304,16 @@ void mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif, > > * The resulting bssidx mismatch for unicast frames is ignored by hw. > > */ > > if (vif->type == NL80211_IFTYPE_STATION) > > - idx += 8; > > + offset = 8; > > + > > + idx = ffs(~(dev->vif_mask >> offset)) - 1; > > + idx += offset; > > + > > + /* Allow to change address is only one interface. */ > > + if (!dev->vif_mask && (!ether_addr_equal(dev->mt76.macaddr, vif->addr))) > > + mt76x02_mac_setaddr(dev, vif->addr); > > I guess this does not work if you add 2 vifs and then you remove the first one > (you will end up with a wrong configuration in MT_MAC_ADDR_DW{0,1}). I guess > the hw will not work well if MT_MAC_ADDR_DW{0,1} is not properly configured This is only done when when vif_mask is 0 i.e. no interfaces. When some interface is already created, changing MAC address will now work anyway. Thanks Stanislaw