Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2060269pxb; Mon, 23 Aug 2021 11:05:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9q7PVSeUeLM0F/mTjgquXnMaK3/VLwR7FAdGUVp7w8n+tbaZRHzkrbdPMWqDB4W2V7xBC X-Received: by 2002:a05:6e02:1d88:: with SMTP id h8mr10639369ila.258.1629741941535; Mon, 23 Aug 2021 11:05:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629741941; cv=none; d=google.com; s=arc-20160816; b=HRgWaJ9/3L7kMEO1LhaWSKfw0amQ3Ta4E49CshKrxG9M9EooVQaU9/M21ZxxvoMOul 2LhCkaWYztTwcYn5njeDjmcUStz00BCf0jlEhXiL9LfnB0TZT71HPYlG2uKcKOemXbY4 fEmKHLgNTaZQTNOgupVqYvn+h5ugvmh6c6i6y0XXCbGXR73Q1m6tgp6J2m9gSuN08P+N 3Hq6zNl2ysyHgS0SI660C47QRhIMaNgvv4oDIbQkNhrVrxzHHs1vExjxfRJ3Y94nAK8H +A7yB6NfKICxDYxu0AIVD7DaUk8PBHS8aIhTNhH6CF99gjW+LBknrucLJBG04hA+VzcI UN/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/nsykPpzvQhblfZASl3X2uuV/EU8YNNtTKz9WztsIhM=; b=BjvlI61x7D+D9FH8WWHWGRi0F6RBC2KjnX1sMTfhw77K6PrfDjRgCCVeyGr5njE6HB bhZRxzvupRIUnCk57bJr8HZCawPzYudf+VTCD6MTdPTpcNuWDRa+onBU53uHEEGfAsuk OTWMToxGEbf3NzPa7CVFP8lLeXoTTux3sQNFpfE6fssyfV4sxJ5Itk4HlrkoWEPJlqPD uUaMJw5hSMKjbFrFaWqmknzHkBRGCxoHKDPE/zFjYgGEAiiHn/ODKxyLWr/3uRLCkrCA 5RATewVisKERyxGPMRnWnUr/5DveupR9s3oCTG60t8DdbJ8KEssepkvJkF/nC2BC0CS1 A3Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ts3TN/c3"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b16si8154637ilf.112.2021.08.23.11.05.28; Mon, 23 Aug 2021 11:05:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ts3TN/c3"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231959AbhHWSEG (ORCPT + 99 others); Mon, 23 Aug 2021 14:04:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:53964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231960AbhHWSD7 (ORCPT ); Mon, 23 Aug 2021 14:03:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 00D2361374; Mon, 23 Aug 2021 18:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629741797; bh=CCz//cD/JjIqiIAf5rENP3Io9oGbhFBtMxemeirWFF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ts3TN/c3gOAV6fO6JIHAn8hB4om9ApBHMLndjV2olRUwUTUGUvnufiKqOtUhZHfPH TKEDoCdBTXcB/xgOqiLvuq9+dZNlTghyDjpxqLtd0VYlvA3hqOaGJ9GVwGy2sXtv/8 LX25SR6bcrHbVl7ixDCsDda+seB3ipQlemyxf1snH3KhoSMoyA9Qox/Mj4tLS1+z2I QmfyUwUOyQAZrVs6sPg2IXSubEI9rPn+K02ZHlF26itSvknklB9KU05xgS1h4y+Pau sr4WHG+4M3gWa+q/oSViYJ9PlXKmiv4MyoZ/MDHhIajeD1C2XO3jpzAHDBoPFD3dV/ giHKosZtkhUzg== From: Lorenzo Bianconi To: nbd@nbd.name, johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com, ryder.lee@mediatek.com, chui-hao.chiu@mediatek.com Subject: [PATCH v4 mac80211-next 4/7] mt76: mt7915: introduce mt7915_mcu_twt_agrt_update mcu command Date: Mon, 23 Aug 2021 20:02:41 +0200 Message-Id: <6fb000f1fc4f1ecb63b5d98542db178feeab81d3.1629741512.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This is a preliminary patch to add TWT support to mt7915 Tested-by: Peter Chiu Signed-off-by: Lorenzo Bianconi --- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 50 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7915/mcu.h | 9 ++++ .../wireless/mediatek/mt76/mt7915/mt7915.h | 19 +++++++ 3 files changed, 78 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c index 50b89d41822a..8bf3d08884f4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c @@ -3893,3 +3893,53 @@ int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif, return ret; } + +#define TWT_AGRT_TRIGGER BIT(0) +#define TWT_AGRT_ANNOUNCE BIT(1) +#define TWT_AGRT_PROTECT BIT(2) + +int mt7915_mcu_twt_agrt_update(struct mt7915_dev *dev, + struct mt7915_vif *mvif, + struct mt7915_twt_flow *flow, + int cmd) +{ + struct { + u8 tbl_idx; + u8 cmd; + u8 own_mac_idx; + u8 flowid; /* 0xff for group id */ + __le16 peer_id; /* specify the peer_id (msb=0) + * or group_id (msb=1) + */ + u8 duration; /* 256 us */ + u8 bss_idx; + __le64 start_tsf; + __le16 mantissa; + u8 exponent; + u8 is_ap; + u8 agrt_params; + u8 rsv[23]; + } __packed req = { + .tbl_idx = flow->id, + .cmd = cmd, + .own_mac_idx = mvif->omac_idx, + .flowid = flow->id, + .peer_id = cpu_to_le16(flow->wcid), + .duration = flow->duration, + .bss_idx = mvif->idx, + .start_tsf = cpu_to_le64(flow->tsf), + .mantissa = flow->mantissa, + .exponent = flow->exp, + .is_ap = true, + }; + + if (flow->protection) + req.agrt_params |= TWT_AGRT_PROTECT; + if (!flow->flowtype) + req.agrt_params |= TWT_AGRT_ANNOUNCE; + if (flow->trigger) + req.agrt_params |= TWT_AGRT_TRIGGER; + + return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(TWT_AGRT_UPDATE), + &req, sizeof(req), true); +} diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h index eda17a94ac58..deec516e905a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h @@ -275,6 +275,7 @@ enum { MCU_EXT_CMD_MWDS_SUPPORT = 0x80, MCU_EXT_CMD_SET_SER_TRIGGER = 0x81, MCU_EXT_CMD_SCS_CTRL = 0x82, + MCU_EXT_CMD_TWT_AGRT_UPDATE = 0x94, MCU_EXT_CMD_FW_DBG_CTRL = 0x95, MCU_EXT_CMD_SET_RDD_TH = 0x9d, MCU_EXT_CMD_MURU_CTRL = 0x9f, @@ -284,6 +285,14 @@ enum { MCU_EXT_CMD_PHY_STAT_INFO = 0xad, }; +enum { + MCU_TWT_AGRT_ADD, + MCU_TWT_AGRT_MODIFY, + MCU_TWT_AGRT_DELETE, + MCU_TWT_AGRT_TEARDOWN, + MCU_TWT_AGRT_GET_TSF, +}; + enum { MCU_WA_PARAM_CMD_QUERY, MCU_WA_PARAM_CMD_SET, diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h index c2909247cfd4..8129f54c2f3f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h @@ -67,6 +67,21 @@ struct mt7915_sta_key_conf { u8 key[16]; }; +struct mt7915_twt_flow { + struct list_head list; + u64 start_tsf; + u64 tsf; + u32 duration; + u16 wcid; + __le16 mantissa; + u8 exp; + u8 id; + u8 protection:1; + u8 flowtype:1; + u8 trigger:1; + u8 sched:1; +}; + struct mt7915_sta { struct mt76_wcid wcid; /* must be first */ @@ -286,6 +301,10 @@ int mt7915_dma_init(struct mt7915_dev *dev); void mt7915_dma_prefetch(struct mt7915_dev *dev); void mt7915_dma_cleanup(struct mt7915_dev *dev); int mt7915_mcu_init(struct mt7915_dev *dev); +int mt7915_mcu_twt_agrt_update(struct mt7915_dev *dev, + struct mt7915_vif *mvif, + struct mt7915_twt_flow *flow, + int cmd); int mt7915_mcu_add_dev_info(struct mt7915_phy *phy, struct ieee80211_vif *vif, bool enable); int mt7915_mcu_add_bss_info(struct mt7915_phy *phy, -- 2.31.1