cfg80211/mac80211: Add support for TID specific configuration
v6 cover cfg80211/mac80211: Add support for TID specific configuration
Add infrastructure to support per TID configurations like noack policy, retry count, AMPDU control(disable/enable), RTSCTS control(enable/disable) and TX rate mask configurations.
This will be useful for the driver which can supports data TID specific configuration rather than phy level configurations. Here NL80211_CMD_SET_TID_CONFIG added to support this operation by accepting TID configuration.
This command can accept STA mac addreess to make the configuration station specific rather than applying to all the connected stations to the netdev.
And this nested command configuration can accept multiple number of data TID specific configuration in a single command,
enum ieee80211_tid_conf_mask used to notify the driver that which configuration got modified for the TID.
Tamizh chelvam (9):
nl80211: New netlink command for TID specific configuration
nl80211: Add new netlink attribute for TID speicific retry count
nl80211: Add netlink attribute for AMPDU aggregation enable/disable
nl80211: Add netlink attribute to enable/disable RTS_CTS
nl80211: Add netlink attribute to configure TID specific tx rate
mac80211: Add api to support configuring TID specific configuration
ath10k: Add wmi command support for station specific TID config
ath10k: Add new api to support TID specific configuration
ath10k: Add extended TID configuration support
v6:
* Addressed Johannes comments.
v5:
* Fixed possible memleak of 'tid_conf' in nl80211_set_tid_config.
v4:
* Fixed kbuild warnings.
v3:
* Modified "nl80211: Add netlink attribute to configure TID specific tx rate" patch to accept multiple TX rate configuration at a time.
* Modified noack and ampdu variable data type to int in
"mac80211: Add api to support configuring TID specific configuration" patch to store default configuration.
* Modified "ath10k: Add new api to support TID specific configuration" patch to handle default values for noack and ampdu. And added sta pointer sanity check in ath10k_mac_tid_bitrate_config function.
* Fixed "ath10k: Add extended TID configuration support" wmi command parameters assigned part.
v2:
* Added support to accept multiple TID configuration
* Added support to configure TX rate and RTSCTS control
drivers/net/wireless/ath/ath10k/core.c | 4 + drivers/net/wireless/ath/ath10k/core.h | 6 + drivers/net/wireless/ath/ath10k/mac.c | 681 +++++++++++++++++++++++++---- drivers/net/wireless/ath/ath10k/wmi-ops.h | 19 + drivers/net/wireless/ath/ath10k/wmi.c | 35 ++ drivers/net/wireless/ath/ath10k/wmi.h | 72 +++ include/net/cfg80211.h | 57 +++ include/net/mac80211.h | 38 ++ include/uapi/linux/nl80211.h | 188 ++++++++ net/mac80211/cfg.c | 28 ++ net/mac80211/driver-ops.h | 15 + net/wireless/nl80211.c | 284 +++++++++++- net/wireless/rdev-ops.h | 12 + net/wireless/trace.h | 17 + 14 files changed, 1371 insertions(+), 85 deletions(-)
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v6 1/9 nl80211: New netlink command for TID specific configuration
Add a new NL command, NL80211_CMD_SET_TID_CONFIG to support data TID specific configuration. This per TID configurations are passed in NL80211_ATTR_TID_CONFIG which is a nested attribute. This patch adds support to configure per TID noack policy through NL80211_TID_ATTR_CONFIG_NOACK attribute. Data TID value for this configuration will be passed through NL80211_TID_ATTR_CONFIG_TID attribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed in NL80211_ATTR_MAC attribute. This patch introduced
enum ieee80211_tid_conf_mask to notify the driver that which configuration modified.
Driver supporting data TID specific noack policy configuration should be advertise through NL80211_EXT_FEATURE_PER_TID_NOACK_CONFIG and supporting per STA data TID noack policy configuration should be advertise through NL80211_EXT_FEATURE_PER_STA_NOACK_CONFIG
--- include/net/cfg80211.h | 35 +++++++++++++ include/uapi/linux/nl80211.h | 57 +++++++++++++++++++++ net/wireless/nl80211.c | 113 ++++++++++++++++++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 12 +++++ net/wireless/trace.h | 17 +++++++ 5 files changed, 234 insertions(+)
include/net/cfg80211.h +35 -0
@@ -525,6 +525,35 @@ struct cfg80211_chan_def {u32 center_freq2; }; +enum ieee80211_tid_conf_mask { +IEEE80211_TID_CONF_NOACK =BIT (0 ), +}; + +/** +* struct ieee80211_tid_cfg - TID specific configuration +* @tid: TID number +* @tid_conf_mask: bitmap indicating which parameter changed +* see %enum ieee80211_tid_conf_mask +* @noack: noack configuration value for the TID +*/ +struct ieee80211_tid_cfg { +u8 tid; +u32 tid_conf_mask; +u8 noack; +}; + +/** +* struct ieee80211_tid_config - TID configuration +* @peer: Station's MAC address +* @n_tid_conf: Number of TID specific configurations to be applied +* @tid_conf: Configuration change info +*/ +struct ieee80211_tid_config { +const u8 *peer; +u32 n_tid_conf; +struct ieee80211_tid_cfg tid_conf[]; +}; +/** * cfg80211_get_chandef_type - return old channel type from chandef * @chandef: the channel definition
@@ -3525,6 +3554,10 @@ struct cfg80211_update_owe_info {* * @probe_mesh_link: Probe direct Mesh peer's link quality by sending data frame * and overrule HWMP path selection algorithm. +* @set_tid_config: TID specific configuration. Apply this configuration for +* all the connected stations in the BSS if peer is %NULL. Otherwise +* apply this configuration to the specific station. +* This callback may sleep. */ struct cfg80211_ops {int (*suspend)(struct wiphy *wiphy,struct cfg80211_wowlan *wow);
@@ -3843,6 +3876,8 @@ struct cfg80211_ops { struct cfg80211_update_owe_info *owe_info);int (*probe_mesh_link)(struct wiphy *wiphy,struct net_device *dev,const u8 *buf,size_t len); +int (*set_tid_config)(struct wiphy *wiphy,struct net_device *dev, +struct ieee80211_tid_config *tid_conf); };/*
include/uapi/linux/nl80211.h +57 -0
99 lines not on this page · raw message
net/wireless/nl80211.c +113 -0
137 lines not on this page · raw message
net/wireless/rdev-ops.h +12 -0
@@ -1299,4 +1299,16 @@ static inline int rdev_update_owe_info(struct cfg80211_registered_device *rdev, return ret; } +static inline int rdev_set_tid_config (struct cfg80211_registered_device *rdev, +struct net_device *dev, +struct ieee80211_tid_config *tid_conf) +{ +int ret; + +trace_rdev_set_tid_config (&rdev->wiphy, dev, tid_conf); + ret = rdev->ops->set_tid_config (&rdev->wiphy, dev, tid_conf); +trace_rdev_return_int (&rdev->wiphy, ret); +return ret; +} +#endif /* __CFG80211_RDEV_OPS */
net/wireless/trace.h +17 -0
@@ -3457,6 +3457,23 @@ WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(dest)) ); +TRACE_EVENT (rdev_set_tid_config, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, + struct ieee80211_tid_config *tid_conf), +TP_ARGS (wiphy, netdev, tid_conf), +TP_STRUCT__entry ( + WIPHY_ENTRY + NETDEV_ENTRY +MAC_ENTRY (peer) + ), +TP_fast_assign ( + WIPHY_ASSIGN; + NETDEV_ASSIGN; + MAC_ASSIGN(peer, tid_conf->peer); + ), +TP_printk (WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT , +WIPHY_PR_ARG ,NETDEV_PR_ARG ,MAC_PR_ARG (peer)) +);#endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCHv6 1/9] nl80211: New netlink command for TID specific configuration
Quoted 18 lines
Add a new NL command,
NL80211_CMD_SET_TID_CONFIGto support data TID specific configuration. This per TID configurations are passed inNL80211_ATTR_TID_CONFIGwhich is a nested attribute. This patch adds support to configure per TID noack policy throughNL80211_TID_ATTR_CONFIG_NOACKattribute. Data TID value for this configuration will be passed throughNL80211_TID_ATTR_CONFIG_TIDattribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed inNL80211_ATTR_MACattribute. This patch introduced
enumieee80211_tid_conf_maskto notify the driver that which configuration modified.
Driver supporting data TID specific noack policy configuration should be advertise throughNL80211_EXT_FEATURE_PER_TID_NOACK_CONFIGand supporting per STA data TID noack policy configuration should be advertise throughNL80211_EXT_FEATURE_PER_STA_NOACK_CONFIGSigned-off-by Tamizh chelvam <[email protected]>
...
Quoted 5 lines
net/wireless/nl80211.c +5
-0+static int parse_tid_conf (struct cfg80211_registered_device *rdev, +struct nlattr *attrs[], +struct ieee80211_tid_cfg *tid_conf, +struct genl_info *info,const u8 *peer) +{
...
Quoted 38 lines
net/wireless/nl80211.c +38
-0+static int nl80211_set_tid_config (struct sk_buff *skb, +struct genl_info *info) +{ +struct cfg80211_registered_device *rdev = info->user_ptr[0 ]; +struct nlattr *attrs[NL80211_TID_ATTR_CONFIG_MAX +1 ]; +struct net_device *dev = info->user_ptr[1 ]; +struct ieee80211_tid_config *tid_config; +struct nlattr *tid; +int conf_idx =0 , rem_conf; +int ret = -EINVAL ; +u32 num_conf =0 ; + +if (!info->attrs[NL80211_ATTR_TID_CONFIG ]) +return -EINVAL ; + +if (!rdev->ops->set_tid_config) +return -EOPNOTSUPP ; + +nla_for_each_nested (tid, info->attrs[NL80211_ATTR_TID_CONFIG ], + rem_conf) + num_conf++; + + tid_config =kzalloc (struct_size (tid_config, tid_conf, num_conf), +GFP_KERNEL ); +if (!tid_config) +return -ENOMEM ; + + tid_config->n_tid_conf = num_conf; + +if (info->attrs[NL80211_ATTR_MAC ]) + tid_config->peer =nla_data (info->attrs[NL80211_ATTR_MAC ]); + +nla_for_each_nested (tid, info->attrs[NL80211_ATTR_TID_CONFIG ], + rem_conf) { + ret =nla_parse_nested_deprecated (attrs,NL80211_TID_ATTR_CONFIG_MAX , + tid,NULL ,NULL ); + +if (ret)
net/wireless/nl80211.c static int nl80211_probe_mesh_link(struct sk_buff *skb, struct genl_info *info) · line 13670
Quoted 10 lines
net/wireless/nl80211.c +10
-0+ goto bad_tid_conf; + +if (!attrs[NL80211_TID_ATTR_CONFIG_TID ]) { + ret = -EINVAL ; + goto bad_tid_conf; + } + + ret =parse_tid_conf (rdev, attrs, + &tid_config->tid_conf[conf_idx], + tid_config->peer);
Argument 'info' is missing here from parse_tid_conf. IIUC, appropriate fixup is included into patch #5. So it looks like rebase issue. But it makes sense to fix it since this issue makes the patch set non-bisectable.
Regareds,
Sergey
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCHv6 1/9] nl80211: New netlink command for TID specific configuration
Quoted 78 lines · Sergey Matyukevich
Quoted 18 lines
Add a new NL command,
NL80211_CMD_SET_TID_CONFIGto support data TID specific configuration. This per TID configurations are passed inNL80211_ATTR_TID_CONFIGwhich is a nested attribute. This patch adds support to configure per TID noack policy throughNL80211_TID_ATTR_CONFIG_NOACKattribute. Data TID value for this configuration will be passed throughNL80211_TID_ATTR_CONFIG_TIDattribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed inNL80211_ATTR_MACattribute. This patch introduced
enumieee80211_tid_conf_maskto notify the driver that which configuration modified.
Driver supporting data TID specific noack policy configuration should be advertise throughNL80211_EXT_FEATURE_PER_TID_NOACK_CONFIGand supporting per STA data TID noack policy configuration should be advertise throughNL80211_EXT_FEATURE_PER_STA_NOACK_CONFIGSigned-off-by Tamizh chelvam <[email protected]>...
Quoted 5 lines
net/wireless/nl80211.c +5
-0+static int parse_tid_conf (struct cfg80211_registered_device *rdev, +struct nlattr *attrs[], +struct ieee80211_tid_cfg *tid_conf, +struct genl_info *info,const u8 *peer) +{...
Quoted 48 lines
net/wireless/nl80211.c +23
-0+static int nl80211_set_tid_config (struct sk_buff *skb, +struct genl_info *info) +{ +struct cfg80211_registered_device *rdev = info->user_ptr[0 ]; +struct nlattr *attrs[NL80211_TID_ATTR_CONFIG_MAX +1 ]; +struct net_device *dev = info->user_ptr[1 ]; +struct ieee80211_tid_config *tid_config; +struct nlattr *tid; +int conf_idx =0 , rem_conf; +int ret = -EINVAL ; +u32 num_conf =0 ; + +if (!info->attrs[NL80211_ATTR_TID_CONFIG ]) +return -EINVAL ; + +if (!rdev->ops->set_tid_config) +return -EOPNOTSUPP ; + +nla_for_each_nested (tid, info->attrs[NL80211_ATTR_TID_CONFIG ], + rem_conf) + num_conf++; + + tid_config = kzalloc(struct_size(tid_config, tid_conf,
num_conf),net/wireless/nl80211.c +8
-0+ GFP_KERNEL); +if (!tid_config) +return -ENOMEM ; + + tid_config->n_tid_conf = num_conf; + +if (info->attrs[NL80211_ATTR_MAC ]) + tid_config->peer =
nla_data(info->attrs[NL80211_ATTR_MAC]);net/wireless/nl80211.c +4
-0+ +nla_for_each_nested (tid, info->attrs[NL80211_ATTR_TID_CONFIG ], + rem_conf) { + ret = nla_parse_nested_deprecated(attrs,
NL80211_TID_ATTR_CONFIG_MAX,net/wireless/nl80211.c +10
-0+ tid, NULL, NULL); + +if (ret) + goto bad_tid_conf; + +if (!attrs[NL80211_TID_ATTR_CONFIG_TID ]) { + ret = -EINVAL ; + goto bad_tid_conf; + } +
Quoted 9 lines
net/wireless/nl80211.c static int nl80211_probe_mesh_link(struct sk_buff *skb, struct genl_info *info) · line 13670
Quoted 3 lines
net/wireless/nl80211.c +3
-0+ ret =parse_tid_conf (rdev, attrs, + &tid_config->tid_conf[conf_idx], + tid_config->peer);Argument 'info' is missing here from
parse_tid_conf. IIUC, appropriate fixup is included into patch #5. So it looks like rebase issue. But it makes sense to fix it since this issue makes the patch set non-bisectable.
My bad. Yes, it is missed in the rebase. I will fix that.
Thanks,
Tamizh.
Re: [PATCHv6 1/9] nl80211: New netlink command for TID specific configuration
In reply to Tamizh chelvamQuoted 18 lines
Add a new NL command,
NL80211_CMD_SET_TID_CONFIGto support data TID specific configuration. This per TID configurations are passed inNL80211_ATTR_TID_CONFIGwhich is a nested attribute. This patch adds support to configure per TID noack policy throughNL80211_TID_ATTR_CONFIG_NOACKattribute. Data TID value for this configuration will be passed throughNL80211_TID_ATTR_CONFIG_TIDattribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed inNL80211_ATTR_MACattribute. This patch introduced
enumieee80211_tid_conf_maskto notify the driver that which configuration modified.
Driver supporting data TID specific noack policy configuration should be advertise throughNL80211_EXT_FEATURE_PER_TID_NOACK_CONFIGand supporting per STA data TID noack policy configuration should be advertise throughNL80211_EXT_FEATURE_PER_STA_NOACK_CONFIGSigned-off-by Tamizh chelvam <[email protected]>
...
Quoted 5 lines
net/wireless/nl80211.c +0
-0
net/wireless/nl80211.c static int validate_ie_attr(const struct nlattr *attr, · line 290
Quoted 10 lines
net/wireless/nl80211.c +7
-0@@ -281,6 +281,13 @@ static int validate_ie_attr(const struct nlattr *attr, NLA_POLICY_NESTED_ARRAY(nl80211_psmr_peer_attr_policy), }; +static const struct nla_policy +nl80211_tid_attr_config_policy[NL80211_TID_ATTR_CONFIG_MAX +1 ] = { + [NL80211_TID_ATTR_CONFIG_TID ] = { .type =NLA_U8 }, + [NL80211_TID_ATTR_CONFIG_NOACK ] = +NLA_POLICY_MAX (NLA_U8 ,NL80211_TID_CONFIG_DISABLE ), +}; +
IIUC, in the current version of the patch set no specific value of NL80211_TID_ATTR_CONFIG_TID attribute is reserved for 'apply to all tids' command. It could be left up to drivers. But we need some convention for userspace tools (e.g. iw) anyway.
Regards,
Sergey
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCHv6 1/9] nl80211: New netlink command for TID specific configuration
In reply to Tamizh chelvamHi,
Was waiting for you to address Sergey's feedback, but now that I looked anyway, I have some of my own. Sorry for the long delay though!
Quoted 2 lines
+ * @NL80211_ATTR_TID_CONFIG: TID specific configuration in a
+ * nested attribute with %NL80211_TID_ATTR_* sub-attributes.
Please use NL80211_TID_CONFIG_ATTR_* throughout, also for
Quoted 1 line
+/* enum
nl80211_tid_attr_config- TID specific configuration.
the enum name
include/uapi/linux/nl80211.h enum nl80211_tx_power_setting { · line 4684
Quoted 8 lines
include/uapi/linux/nl80211.h +8
-0+enum nl80211_tid_attr_config { + __NL80211_TID_ATTR_INVALID, +NL80211_TID_ATTR_CONFIG_TID , +NL80211_TID_ATTR_CONFIG_NOACK , + +/* keep last */ + __NL80211_TID_ATTR_CONFIG_AFTER_LAST, +NL80211_TID_ATTR_CONFIG_MAX = __NL80211_TID_ATTR_CONFIG_AFTER_LAST -1
and all the things in it.
Also, as you can see above, the kernel-doc comment isn't formatted right.
net/wireless/nl80211.c static int nl80211_probe_mesh_link(struct sk_buff *skb, struct genl_info *info) · line 13658
Quoted 4 lines
net/wireless/nl80211.c +4
-0+nla_for_each_nested (tid, info->attrs[NL80211_ATTR_TID_CONFIG ], + rem_conf) { + ret =nla_parse_nested_deprecated (attrs,NL80211_TID_ATTR_CONFIG_MAX , + tid,NULL ,NULL );
You shouldn't use _deprecated.
net/wireless/nl80211.c static int nl80211_probe_mesh_link(struct sk_buff *skb, struct genl_info *info) · line 13670
Quoted 3 lines
net/wireless/nl80211.c +3
-0+ ret =parse_tid_conf (rdev, attrs, + &tid_config->tid_conf[conf_idx], + tid_config->peer);
and yeah, this should compile.
johannes
Re: [PATCHv6 1/9] nl80211: New netlink command for TID specific configuration
Quoted 11 lines
Quoted 4 lines
+ * @NL80211_ATTR_TID_CONFIG: TID specific configuration in a
+ * nested attribute with %NL80211_TID_ATTR_* sub-attributes.Please use NL80211_TID_CONFIG_ATTR_* throughout, also for
Quoted 1 line
+/* enum
nl80211_tid_attr_config- TID specific configuration.the enum name
Quoted 11 lines
Quoted 9 lines
include/uapi/linux/nl80211.h +8
-0+enum nl80211_tid_attr_config { + __NL80211_TID_ATTR_INVALID, +NL80211_TID_ATTR_CONFIG_TID , +NL80211_TID_ATTR_CONFIG_NOACK , + +/* keep last */ + __NL80211_TID_ATTR_CONFIG_AFTER_LAST, + NL80211_TID_ATTR_CONFIG_MAX = __NL80211_TID_ATTR_CONFIG_AFTER_LAST -1
and all the things in it.
sure.
Quoted 3 lines
Also, as you can see above, the kernel-doc comment isn't formatted right.
sure, I will fix it.
Quoted 9 lines
net/wireless/nl80211.c static int nl80211_probe_mesh_link(struct sk_buff *skb, struct genl_info *info) · line 13658
Quoted 6 lines
net/wireless/nl80211.c +3
-0+nla_for_each_nested (tid, info->attrs[NL80211_ATTR_TID_CONFIG ], + rem_conf) { + ret = nla_parse_nested_deprecated(attrs,
NL80211_TID_ATTR_CONFIG_MAX,net/wireless/nl80211.c +1
-0+ tid, NULL, NULL);You shouldn't use
_deprecated.
Okay.
Quoted 6 lines
net/wireless/nl80211.c static int nl80211_probe_mesh_link(struct sk_buff *skb, struct genl_info *info) · line 13670
Quoted 3 lines
net/wireless/nl80211.c +3
-0+ ret =parse_tid_conf (rdev, attrs, + &tid_config->tid_conf[conf_idx], + tid_config->peer);and yeah, this should compile.
My bad. Sorry about this. I will fix this in the next version.
Thanks,
Tamizh.
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCHv6 1/9] nl80211: New netlink command for TID specific configuration
In reply to Tamizh chelvaminclude/uapi/linux/nl80211.h enum nl80211_tx_power_setting { · line 4658
Quoted 12 lines · Tamizh chelvam
/**
+ * enumnl80211_tid_config- TID config state
+ * @NL80211_TID_CONFIG_DEFAULT: Default config for the TID
+ * @NL80211_TID_CONFIG_ENABLE: Enable config for the TID
+ *NL80211_TID_CONFIG_DISABLE: Disable config for the TID
+ */include/uapi/linux/nl80211.h +5
-0+enum nl80211_tid_config { +NL80211_TID_CONFIG_DEFAULT , +NL80211_TID_CONFIG_ENABLE , +NL80211_TID_CONFIG_DISABLE , +};
Hmm. Looking at this in more detail in patch 3, I don't understand.
How is DEFAULT different from "attribute not present", i.e. "no changes"?
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCHv6 1/9] nl80211: New netlink command for TID specific configuration
Quoted 16 lines · Johannes Berg
include/uapi/linux/nl80211.h enum nl80211_tx_power_setting { · line 4658
Quoted 12 lines · Tamizh chelvam
/**
+ * enumnl80211_tid_config- TID config state
+ * @NL80211_TID_CONFIG_DEFAULT: Default config for the TID
+ * @NL80211_TID_CONFIG_ENABLE: Enable config for the TID
+ *NL80211_TID_CONFIG_DISABLE: Disable config for the TID
+ */include/uapi/linux/nl80211.h +5
-0+enum nl80211_tid_config { +NL80211_TID_CONFIG_DEFAULT , +NL80211_TID_CONFIG_ENABLE , +NL80211_TID_CONFIG_DISABLE , +};Hmm. Looking at this in more detail in patch 3, I don't understand.
Quoted 3 lines
How is DEFAULT different from "attribute not present", i.e. "no changes"?
This DEFAULT is used to notify the driver to use default configuration value of driver/vif. This will be used when the attribute is not present.
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCHv6 1/9] nl80211: New netlink command for TID specific configuration
Quoted 16 lines · Tamizh chelvam
Quoted 15 lines · Johannes Berg
include/uapi/linux/nl80211.h enum nl80211_tx_power_setting { · line 4658
Quoted 11 lines · Tamizh chelvam
/**
+ * enumnl80211_tid_config- TID config state
+ * @NL80211_TID_CONFIG_DEFAULT: Default config for the TID
+ * @NL80211_TID_CONFIG_ENABLE: Enable config for the TID
+ *NL80211_TID_CONFIG_DISABLE: Disable config for the TID
+ */include/uapi/linux/nl80211.h +5
-0+enum nl80211_tid_config { +NL80211_TID_CONFIG_DEFAULT , +NL80211_TID_CONFIG_ENABLE , +NL80211_TID_CONFIG_DISABLE , +};Hmm. Looking at this in more detail in patch 3, I don't understand.
Quoted 6 lines
Quoted 3 lines
How is DEFAULT different from "attribute not present", i.e. "no changes"?
This DEFAULT is used to notify the driver to use default configuration value of driver/vif.
This will be used when the attribute is not present.
Hm, but then why is it valid in the nl80211 attribute? That seems confusing. Maybe there should rather be a validity bit somewhere in the internal API, so the nl82011 API doesn't need to be concerned with this?
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v6 2/9 nl80211: Add new netlink attribute for TID speicific retry count
In reply to Tamizh chelvamThis patch introduced below NL attributes to add support for configuring data TID specific retry count
NL80211_TID_ATTR_CONFIG_RETRYNL80211_TID_ATTR_CONFIG_RETRY_LONGNL80211_TID_ATTR_CONFIG_RETRY_SHORT
These attributes are added in NL80211_ATTR_TID_CONFIG nested attribute. This will be useful for the driver which supports data TID specific retry count configuration rather using phy level retry configuration. This TID specific retry configuration will have more precedence than phy level configuration. This configuration can be applied for a specific peer. To apply this configuration specific to a peer rather than being applied for all the connected stations,
MAC address of the peer can be passed in NL80211_ATTR_MAC attribute.
Driver should advertise WIPHY_FLAG_HAS_MAX_DATA_RETRY_COUNT and max_data_retry_count value to notify user space to avoid of passing greater than the allowed limit.
Driver supporting TID specific retry configuration should advertise NL80211_EXT_FEATURE_PER_TID_RETRY_CONFIG and per STA specific data TID retry configuration should advertise NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG.
--- include/net/cfg80211.h | 11 ++++++++++ include/uapi/linux/nl80211.h | 48 ++++++++++++++++++++++++++++++++++++++++++ net/wireless/nl80211.c | 44 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+)
include/net/cfg80211.h +11 -0
@@ -527,6 +527,7 @@ struct cfg80211_chan_def {enum ieee80211_tid_conf_mask {IEEE80211_TID_CONF_NOACK =BIT (0 ), +IEEE80211_TID_CONF_RETRY =BIT (1 ), };/**
@@ -535,11 +536,15 @@ enum ieee80211_tid_conf_mask {* @tid_conf_mask: bitmap indicating which parameter changed * see %enum ieee80211_tid_conf_mask * @noack: noack configuration value for the TID +* @retry_long: retry count value +* @retry_short: retry count value */ struct ieee80211_tid_cfg {u8 tid;u32 tid_conf_mask;u8 noack; +int retry_long; +int retry_short; };/**
@@ -3925,6 +3930,7 @@ struct cfg80211_ops {* beaconing mode (AP, IBSS, Mesh, ...). * @WIPHY_FLAG_HAS_STATIC_WEP: The device supports static WEP key installation * before connection. +* @WIPHY_FLAG_HAS_MAX_DATA_RETRY_COUNT: Device supports data retry count call. */ enum wiphy_flags {/* use hole at 0 */
@@ -3951,6 +3957,7 @@ enum wiphy_flags {WIPHY_FLAG_SUPPORTS_5_10_MHZ =BIT (22 ),WIPHY_FLAG_HAS_CHANNEL_SWITCH =BIT (23 ),WIPHY_FLAG_HAS_STATIC_WEP =BIT (24 ), + WIPHY_FLAG_HAS_MAX_DATA_RETRY_COUNT = BIT(25), };/**
@@ -4466,6 +4473,8 @@ struct cfg80211_pmsr_capabilities {* @support_mbssid must be set for this to have any effect. * * @pmsr_capa: peer measurement capabilities +* @max_data_retry_count: Maximum limit can be configured as retry count +* for a TID. */ struct wiphy {/* assign these fields before you register the wiphy */
@@ -4610,6 +4619,8 @@ struct wiphy {const struct cfg80211_pmsr_capabilities *pmsr_capa; +u8 max_data_retry_count; +char priv[0 ]__aligned(NETDEV_ALIGN) ; };
include/uapi/linux/nl80211.h +48 -0
83 lines not on this page · raw message
net/wireless/nl80211.c +44 -0
56 lines not on this page · raw message
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCHv6 2/9] nl80211: Add new netlink attribute for TID speicific retry count
^^ there's a typo in the subject
include/net/cfg80211.h enum wiphy_flags { · line 3960
Quoted 5 lines
include/net/cfg80211.h +1
-0@@ -3951,6 +3957,7 @@ enum wiphy_flags {WIPHY_FLAG_SUPPORTS_5_10_MHZ =BIT (22 ),WIPHY_FLAG_HAS_CHANNEL_SWITCH =BIT (23 ),WIPHY_FLAG_HAS_STATIC_WEP =BIT (24 ), + WIPHY_FLAG_HAS_MAX_DATA_RETRY_COUNT = BIT(25),
This is never used, so that doesn't make sense? You probably want to advertise the max_data_retry_count value contingent on this flag (*) in some attribute, so that userspace can also detect the presence/absence of the flag for the feature?
(*) doesn't really need to be contingent on the flag - could just be contingent on max_data_retry_count being non-zero and then you don't need the flag.
include/uapi/linux/nl80211.h enum nl80211_attrs { · line 2828
Quoted 10 lines
include/uapi/linux/nl80211.h +3
-0+* @NL80211_ATTR_MAX_RETRY_COUNT: The upper limit for the retry count +* configuration that the driver can accept. * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined @@ -2823,6 +2825,7 @@ enum nl80211_attrs {NL80211_ATTR_TWT_RESPONDER ,NL80211_ATTR_TID_CONFIG , + NL80211_ATTR_MAX_RETRY_COUNT,
You already have the attribute, but again, aren't using it.
include/uapi/linux/nl80211.h enum nl80211_feature_flags { · line 5547
Quoted 4 lines
include/uapi/linux/nl80211.h +4
-0+* @NL80211_EXT_FEATURE_PER_TID_RETRY_CONFIG: Driver supports per TID data retry +* count functionality. +* @NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG: Driver supports STA specific +* data retry count functionality.
and if you have these you don't need the WIPHY_FLAG anyway?
net/wireless/nl80211.c static int validate_ie_attr(const struct nlattr *attr, · line 291
Quoted 3 lines
net/wireless/nl80211.c +3
-0+ [NL80211_TID_ATTR_CONFIG_RETRY] = { .type = NLA_FLAG }, + [NL80211_TID_ATTR_CONFIG_RETRY_SHORT] = NLA_POLICY_MIN(NLA_U8, 0), + [NL80211_TID_ATTR_CONFIG_RETRY_LONG] = NLA_POLICY_MIN(NLA_U8, 0),
min of 0 doesn't make sense, maybe you meant 1? otherwise just don't set anything here.
Review
Quoted 2 lines
(quoted diff) +2
-0+ "TID specific configuration not " + "supported");
This applies to all the patches - please don't break strings across multiple lines, even if they cross 80 columns. Even checkpatch won't give you any warning on this.
net/wireless/nl80211.c static int parse_tid_conf(struct cfg80211_registered_device *rdev, · line 13652
Quoted 10 lines
net/wireless/nl80211.c +10
-0+ tid_conf->tid_conf_mask |=IEEE80211_TID_CONF_RETRY ; +if (attrs[NL80211_TID_ATTR_CONFIG_RETRY_SHORT ]) { + tid_conf->retry_short = +nla_get_u8 (attrs[NL80211_TID_ATTR_CONFIG_RETRY_SHORT ]); +if (tid_conf->retry_short > + rdev->wiphy.max_data_retry_count) +return -EINVAL ; + }else { + tid_conf->retry_short =-1 ; +
I guess you should document that -1 means no changes? Not sure how the IEEE80211_TID_CONF_RETRY comes in, you're always setting it, so that's useless - better remove that and document that -1 means no changes?
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCHv6 2/9] nl80211: Add new netlink attribute for TID speicific retry count
Quoted 2 lines · Johannes Berg
^^ there's a typo in the subject
I will fix it in next version.
Quoted 11 lines
include/net/cfg80211.h enum wiphy_flags { · line 3960
Quoted 5 lines
include/net/cfg80211.h +1
-0@@ -3951,6 +3957,7 @@ enum wiphy_flags {WIPHY_FLAG_SUPPORTS_5_10_MHZ =BIT (22 ),WIPHY_FLAG_HAS_CHANNEL_SWITCH =BIT (23 ),WIPHY_FLAG_HAS_STATIC_WEP =BIT (24 ), + WIPHY_FLAG_HAS_MAX_DATA_RETRY_COUNT = BIT(25),This is never used, so that doesn't make sense? You probably want to advertise the
max_data_retry_countvalue contingent on this flag (*) in some attribute, so that userspace can also detect the presence/absence of the flag for the feature?
Quoted 4 lines
(*) doesn't really need to be contingent on the flag - could just be contingent on
max_data_retry_countbeing non-zero and then you don't need the flag.
Sure, I will remove this flag.
Quoted 8 lines
Quoted 8 lines
include/uapi/linux/nl80211.h +2
-0+* @NL80211_ATTR_MAX_RETRY_COUNT: The upper limit for the retry count +* configuration that the driver can accept. * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined @@ -2823,6 +2825,7 @@ enum nl80211_attrs { NL80211_ATTR_TWT_RESPONDER,
Quoted 5 lines
include/uapi/linux/nl80211.h enum nl80211_attrs { · line 2828
Quoted 2 lines
include/uapi/linux/nl80211.h +1
-0NL80211_ATTR_TID_CONFIG , + NL80211_ATTR_MAX_RETRY_COUNT,You already have the attribute, but again, aren't using it.
I will use this in nl80211_get_wiphy to notify userspace.
Quoted 9 lines
Quoted 6 lines
(quoted diff) +1
-0+ * @NL80211_EXT_FEATURE_PER_TID_RETRY_CONFIG: Driver supports per TIDdata retry
+ * count functionality.
+ * @NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG: Driver supports STA specific
+ * data retry count functionality.and if you have these you don't need the
WIPHY_FLAGanyway?
Sure.
Quoted 7 lines
net/wireless/nl80211.c static int validate_ie_attr(const struct nlattr *attr, · line 291
Quoted 3 lines
net/wireless/nl80211.c +3
-0+ [NL80211_TID_ATTR_CONFIG_RETRY] = { .type = NLA_FLAG }, + [NL80211_TID_ATTR_CONFIG_RETRY_SHORT] = NLA_POLICY_MIN(NLA_U8, 0), + [NL80211_TID_ATTR_CONFIG_RETRY_LONG] = NLA_POLICY_MIN(NLA_U8, 0),min of 0 doesn't make sense, maybe you meant 1? otherwise just don't set anything here.
The min value changed to 0 from 1 as per the previous discussions, since this is a retry count and not a tx count. Or Shall I remove this min value to avoid the confusion ?
Quoted 8 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ "TID specific configuration not " + "supported");This applies to all the patches - please don't break strings across multiple lines, even if they cross 80 columns. Even checkpatch won't give you any warning on this.
Yeah, sure.
Quoted 6 lines
Quoted 6 lines
net/wireless/nl80211.c +6
-0+ tid_conf->tid_conf_mask |=IEEE80211_TID_CONF_RETRY ; +if (attrs[NL80211_TID_ATTR_CONFIG_RETRY_SHORT ]) { + tid_conf->retry_short = +nla_get_u8 (attrs[NL80211_TID_ATTR_CONFIG_RETRY_SHORT ]); +if (tid_conf->retry_short > + rdev->wiphy.max_data_retry_count)
Quoted 9 lines
net/wireless/nl80211.c static int parse_tid_conf(struct cfg80211_registered_device *rdev, · line 13652
Quoted 4 lines
net/wireless/nl80211.c +4
-0+return -EINVAL ; + }else { + tid_conf->retry_short =-1 ; +I guess you should document that -1 means no changes? Not sure how the
IEEE80211_TID_CONF_RETRYcomes in, you're always setting it, so that's useless - better remove that and document that -1 means no changes?
The value -1 is to notify the driver to use default value by removing peer specific retry count.
Thanks,
Tamizh.
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCHv6 2/9] nl80211: Add new netlink attribute for TID speicific retry count
Quoted 9 lines · Tamizh chelvam
Quoted 9 lines
net/wireless/nl80211.c static int validate_ie_attr(const struct nlattr *attr, · line 291
Quoted 4 lines
net/wireless/nl80211.c +3
-0+ [NL80211_TID_ATTR_CONFIG_RETRY] = { .type = NLA_FLAG }, + [NL80211_TID_ATTR_CONFIG_RETRY_SHORT] = NLA_POLICY_MIN(NLA_U8, 0), + [NL80211_TID_ATTR_CONFIG_RETRY_LONG] = NLA_POLICY_MIN(NLA_U8, 0),min of 0 doesn't make sense, maybe you meant 1? otherwise just don't set
anything here.
Quoted 3 lines
The min value changed to 0 from 1 as per the previous discussions, since this is a retry count and not a tx count.
Or Shall I remove this min value to avoid the confusion ?
Yeah, I think then you should just remove the min value. Perhaps a max value is needed, but I don't know.
Quoted 9 lines
Quoted 7 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ tid_conf->retry_short = -1; +I guess you should document that -1 means no changes? Not sure how the
IEEE80211_TID_CONF_RETRYcomes in, you're always setting it, so that's useless - better remove that and document that -1 means no changes?The value -1 is to notify the driver to use default value by removing peer specific retry count.
Oh. So I think that's slightly different, please document that.
johannes
PATCH v6 3/9 nl80211: Add netlink attribute for AMPDU aggregation enable/disable
In reply to Tamizh chelvamIntroduce NL80211_TID_ATTR_CONFIG_AMPDU_CTRL in nl80211_attr_tid_config to accept TID specific AMPDU aggregation enable/disable configuration through NL80211_CMD_SET_TID_CONFIG command. TID for which the aggregation control configuration is to be applied is passed in NL80211_TID_ATTR_CONFIG_TID attribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed in NL80211_ATTR_MAC attribute.
Driver supporting this feature should advertise NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL and supporting per-STA data TID ampdu configuration should advertise NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL.
--- include/net/cfg80211.h | 3 +++ include/uapi/linux/nl80211.h | 22 ++++++++++++++++++++++ net/wireless/nl80211.c | 25 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+)
include/net/cfg80211.h +3 -0
@@ -528,6 +528,7 @@ struct cfg80211_chan_def {enum ieee80211_tid_conf_mask {IEEE80211_TID_CONF_NOACK =BIT (0 ),IEEE80211_TID_CONF_RETRY =BIT (1 ), +IEEE80211_TID_CONF_AMPDU =BIT (2 ), };/**
@@ -538,6 +539,7 @@ enum ieee80211_tid_conf_mask {* @noack: noack configuration value for the TID * @retry_long: retry count value * @retry_short: retry count value +* @ampdu: Enable/Disable aggregation */ struct ieee80211_tid_cfg {u8 tid;
@@ -545,6 +547,7 @@ struct ieee80211_tid_cfg {u8 noack;int retry_long;int retry_short; +u8 ampdu; };/**
include/uapi/linux/nl80211.h +22 -0
@@ -4712,6 +4712,21 @@ enum nl80211_tid_config {* the max value should be advertised by the driver through * max_data_retry_count. when this attribute is not present, the driver * would use the default configuration. +* @NL80211_TID_ATTR_CONFIG_AMPDU_CTRL: Enable/Disable aggregation for the TID +* specified in %%NL80211_TID_ATTR_CONFIG_TID. Its type is u8, +* if the peer MAC address is passed in %NL80211_ATTR_MAC, the aggregation +* configuration is applied +* to the data frame for the tid to that connected station. +* Station specific aggregation configuration is valid only for STA's +* current connection. i.e. the configuration will be reset to default when +* the station connects back after disconnection/roaming. +* when user-space does not include %NL80211_ATTR_MAC, this configuration +* should be treated as per-netdev configuration. This configuration will +* be cleared when the interface goes down and on the disconnection from a +* BSS. Driver supporting this feature should advertise +* NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL and supporting per station +* aggregation configuration should advertise +* NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL. */ enum nl80211_tid_attr_config { __NL80211_TID_ATTR_INVALID,
@@ -4720,6 +4735,7 @@ enum nl80211_tid_attr_config {NL80211_TID_ATTR_CONFIG_RETRY ,NL80211_TID_ATTR_CONFIG_RETRY_SHORT ,NL80211_TID_ATTR_CONFIG_RETRY_LONG , +NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ,/* keep last */ __NL80211_TID_ATTR_CONFIG_AFTER_LAST,
@@ -5545,6 +5561,10 @@ enum nl80211_feature_flags {* count functionality. * @NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG: Driver supports STA specific * data retry count functionality. +* @NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL: Driver supports TID specific +* aggregation control(enable/disable). +* @NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL: Driver supports per STA +* specific TID aggregation control(enable/disable). * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -5595,6 +5615,8 @@ enum nl80211_ext_feature_index {NL80211_EXT_FEATURE_PER_STA_NOACK_CONFIG ,NL80211_EXT_FEATURE_PER_TID_RETRY_CONFIG ,NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG , +NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL , +NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL ,/* add new features before the definition below */ NUM_NL80211_EXT_FEATURES,
net/wireless/nl80211.c +25 -0
@@ -289,6 +289,8 @@ static int validate_ie_attr(const struct nlattr *attr, [NL80211_TID_ATTR_CONFIG_RETRY] = { .type = NLA_FLAG }, [NL80211_TID_ATTR_CONFIG_RETRY_SHORT] = NLA_POLICY_MIN(NLA_U8, 0), [NL80211_TID_ATTR_CONFIG_RETRY_LONG] = NLA_POLICY_MIN(NLA_U8, 0), + [NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ] = + NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE), };const struct nla_policy nl80211_policy[NUM_NL80211_ATTR ] = {
@@ -13661,6 +13663,29 @@ static int parse_tid_conf(struct cfg80211_registered_device *rdev, } } +if (attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ]) { +if (!wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL )) { +NL_SET_ERR_MSG_ATTR (extack, + attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ], +"TID specific configuration not " +"supported" ); +return -ENOTSUPP ; + } + +if (peer && !wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL )) { +NL_SET_ERR_MSG_ATTR (extack, + attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ], +"peer specfic TID configuration not " +"supported" ); +return -ENOTSUPP ; + } + + tid_conf->tid_conf_mask |=IEEE80211_TID_CONF_AMPDU ; + tid_conf->ampdu = +nla_get_u8 (attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ]); + }return 0 ; }
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCHv6 3/9] nl80211: Add netlink attribute for AMPDU aggregation enable/disable
Quoted 8 lines · Tamizh chelvam
net/wireless/nl80211.c +7
-0+if (!wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL )) { +NL_SET_ERR_MSG_ATTR (extack, + attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ], +"TID specific configuration not " +"supported" ); +return -ENOTSUPP ;
net/wireless/nl80211.c static int parse_tid_conf(struct cfg80211_registered_device *rdev, · line 13683
Quoted 10 lines
net/wireless/nl80211.c +10
-0+ } + +if (peer && !wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL )) { +NL_SET_ERR_MSG_ATTR (extack, + attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ], +"peer specfic TID configuration not " +"supported" ); +return -ENOTSUPP ; + }
I think you should probably make this be a function to which you pass the attribute pointer and feature flags.
err = nl80211_check_tid_config_supported(extack,
attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL], NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL, NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL);
since you have this code a lot?
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCHv6 3/9] nl80211: Add netlink attribute for AMPDU aggregation enable/disable
Quoted 23 lines · Johannes Berg
Quoted 8 lines · Tamizh chelvam
net/wireless/nl80211.c +7
-0+if (!wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL )) { +NL_SET_ERR_MSG_ATTR (extack, + attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ], +"TID specific configuration not " +"supported" ); +return -ENOTSUPP ;net/wireless/nl80211.c static int parse_tid_conf(struct cfg80211_registered_device *rdev, · line 13683
Quoted 10 lines
net/wireless/nl80211.c +10
-0+ } + +if (peer && !wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL )) { +NL_SET_ERR_MSG_ATTR (extack, + attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ], +"peer specfic TID configuration not " +"supported" ); +return -ENOTSUPP ; + }I think you should probably make this be a function to which you pass the attribute pointer and feature flags.
Quoted 7 lines
err = nl80211_check_tid_config_supported(extack,
attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL], NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL, NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL);since you have this code a lot?
Sure, I will make that change in the next version of patchset.
Thanks,
Tamizh.
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v6 4/9 nl80211: Add netlink attribute to enable/disable RTS_CTS
In reply to Tamizh chelvamIntroduce NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL in nl80211_attr_tid_config to accept TID specific RTS_CTS enable/disable configuration through NL80211_CMD_SET_TID_CONFIG command. TID for which the RTS_CTS control configuration is to be applied is passed in NL80211_TID_ATTR_CONFIG_TID attribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed in NL80211_ATTR_MAC attribute.
Driver supporting this feature should advertise NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL and supporting per-STA data TID RTS_CTS configuration should advertise NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL.
--- include/net/cfg80211.h | 3 +++ include/uapi/linux/nl80211.h | 22 ++++++++++++++++++++++ net/wireless/nl80211.c | 27 +++++++++++++++++++++++++++ 3 files changed, 52 insertions(+)
include/net/cfg80211.h +3 -0
@@ -529,6 +529,7 @@ enum ieee80211_tid_conf_mask {IEEE80211_TID_CONF_NOACK =BIT (0 ),IEEE80211_TID_CONF_RETRY =BIT (1 ),IEEE80211_TID_CONF_AMPDU =BIT (2 ), + IEEE80211_TID_CONF_RTSCTS = BIT(3), };/**
@@ -540,6 +541,7 @@ enum ieee80211_tid_conf_mask {* @retry_long: retry count value * @retry_short: retry count value * @ampdu: Enable/Disable aggregation +* @rtscts: Enable/Disable RTS/CTS */ struct ieee80211_tid_cfg {u8 tid;
@@ -548,6 +550,7 @@ struct ieee80211_tid_cfg {int retry_long;int retry_short;u8 ampdu; +u8 rtscts; };/**
include/uapi/linux/nl80211.h +22 -0
@@ -4727,6 +4727,21 @@ enum nl80211_tid_config {* NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL and supporting per station * aggregation configuration should advertise * NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL. +* @NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL: Enable/Disable RTS_CTS for the TID +* specified in %%NL80211_TID_ATTR_CONFIG_TID. It is u8 type, if the +* peer MAC address is passed in %NL80211_ATTR_MAC, then this +* configuration is applied to the data frame for the tid to that +* connected station. +* Station specific RTS_CTS configuration is valid only for STA's +* current connection. i.e. the configuration will be reset to default when +* the station connects back after disconnection/roaming. +* when user-space does not include %NL80211_ATTR_MAC, this configuration +* should be treated as per-netdev configuration. This configuration will +* be cleared when the interface goes down and on the disconnection from a +* BSS. Driver supporting this feature should advertise +* NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL and supporting per station +* RTS_CTS configuration should advertise +* NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL. */ enum nl80211_tid_attr_config { __NL80211_TID_ATTR_INVALID,
@@ -4736,6 +4751,7 @@ enum nl80211_tid_attr_config {NL80211_TID_ATTR_CONFIG_RETRY_SHORT ,NL80211_TID_ATTR_CONFIG_RETRY_LONG ,NL80211_TID_ATTR_CONFIG_AMPDU_CTRL , +NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL ,/* keep last */ __NL80211_TID_ATTR_CONFIG_AFTER_LAST,
@@ -5565,6 +5581,10 @@ enum nl80211_feature_flags {* aggregation control(enable/disable). * @NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL: Driver supports per STA * specific TID aggregation control(enable/disable). +* @NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL: Driver supports TID specific +* RTS_CTS control(enable/disable). +* @NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL: Driver supports STA specific +* RTS_CTS control(enable/disable). * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -5617,6 +5637,8 @@ enum nl80211_ext_feature_index {NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG ,NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL ,NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL , +NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL , +NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL ,/* add new features before the definition below */ NUM_NL80211_EXT_FEATURES,
net/wireless/nl80211.c +27 -0
@@ -291,6 +291,8 @@ static int validate_ie_attr(const struct nlattr *attr, [NL80211_TID_ATTR_CONFIG_RETRY_LONG] = NLA_POLICY_MIN(NLA_U8, 0), [NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ] = NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE), + [NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL ] = + NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE), };const struct nla_policy nl80211_policy[NUM_NL80211_ATTR ] = {
@@ -13686,6 +13688,31 @@ static int parse_tid_conf(struct cfg80211_registered_device *rdev, tid_conf->ampdu =nla_get_u8 (attrs[NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ]); } + +if (attrs[NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL ]) { +if (!wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL )) { +NL_SET_ERR_MSG_ATTR (extack, + attrs[NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL ], +"TID specific configuration not " +"supported" ); +return -ENOTSUPP ; + } + +if (peer && !wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL )) { +NL_SET_ERR_MSG_ATTR (extack, + attrs[NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL ], +"peer specfic TID configuration not " +"supported" ); +return -ENOTSUPP ; + } + + tid_conf->tid_conf_mask |=IEEE80211_TID_CONF_RTSCTS ; + tid_conf->rtscts = +nla_get_u8 (attrs[NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL ]); + } +return 0 ; }
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v6 5/9 nl80211: Add netlink attribute to configure TID specific tx rate
In reply to Tamizh chelvamIntroduce NL80211_TID_ATTR_CONFIG_TX_RATES in nl80211_tid_attr_config to accept data TID specific TX bitrate configuration
through NL80211_CMD_SET_TID_CONFIG command. TID for which the this configuration is to be applied is passed in NL80211_TID_ATTR_CONFIG_TID attribute. TX bitrate mask values passed in NL80211_ATTR_TX_RATES attribute and NL80211_TID_ATTR_CONFIG_TX_RATES attribute will have types of the TX rate should be applied. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed in NL80211_ATTR_MAC attribute.
Driver supporting this feature should advertise NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK and supporting per-STA data TID TX bitrate configuration should advertise NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK.
--- include/net/cfg80211.h | 5 +++ include/uapi/linux/nl80211.h | 39 +++++++++++++++++++++ net/wireless/nl80211.c | 77 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 115 insertions(+), 6 deletions(-)
include/net/cfg80211.h +5 -0
@@ -530,6 +530,7 @@ enum ieee80211_tid_conf_mask {IEEE80211_TID_CONF_RETRY =BIT (1 ),IEEE80211_TID_CONF_AMPDU =BIT (2 ),IEEE80211_TID_CONF_RTSCTS =BIT (3 ), + IEEE80211_TID_CONF_TX_BITRATE = BIT(4), };/**
@@ -542,6 +543,8 @@ enum ieee80211_tid_conf_mask {* @retry_short: retry count value * @ampdu: Enable/Disable aggregation * @rtscts: Enable/Disable RTS/CTS +* @txrate_type: TX bitrate mask type +* @mask: bitrate to be applied for the TID */ struct ieee80211_tid_cfg {u8 tid;
@@ -551,6 +554,8 @@ struct ieee80211_tid_cfg {int retry_short;u8 ampdu;u8 rtscts; +enum nl80211_tx_rate_setting txrate_type; +struct cfg80211_bitrate_mask *mask; };/**
include/uapi/linux/nl80211.h +39 -0
@@ -4649,6 +4649,18 @@ enum nl80211_tx_power_setting { };/** +* enum nl80211_tx_rate_setting - TX rate configuration type +* @NL80211_TX_RATE_AUTOMATIC: automatically determine TX rate +* @NL80211_TX_RATE_LIMITED: limit the TX rate by the TX rate parameter +* @NL80211_TX_RATE_FIXED: fix TX rate to the TX rate parameter +*/ +enum nl80211_tx_rate_setting { +NL80211_TX_RATE_AUTOMATIC , +NL80211_TX_RATE_LIMITED , +NL80211_TX_RATE_FIXED , +}; + +/** * enum nl80211_tid_config - TID config state * @NL80211_TID_CONFIG_DEFAULT: Default config for the TID * @NL80211_TID_CONFIG_ENABLE: Enable config for the TID
@@ -4742,6 +4754,25 @@ enum nl80211_tid_config {* NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL and supporting per station * RTS_CTS configuration should advertise * NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL. +* @NL80211_TID_ATTR_CONFIG_TX_RATES: Data frame TX rate mask should be applied +* with the parameters passed through %NL80211_ATTR_TX_RATES. This +* configuration is per TID, TID is specified with +* %NL80211_TID_ATTR_CONFIG_TID. +* If the peer MAC address is passed in %NL80211_ATTR_MAC, then this +* configuration is applied to the data frame for the tid to that connected +* station. This attribute will be useful to notfiy the driver that what +* type of txrate should be applied(%enum enum nl80211_tx_rate_setting) +* for the connected station (%NL80211_ATTR_MAC), +* Station specific retry configuration is valid only for STA's +* current connection. i.e. the configuration will be reset to default when +* the station connects back after disconnection/roaming. +* when user-space does not include %NL80211_ATTR_MAC, this configuration +* should be treated as per-netdev configuration. This configuration will +* be cleared when the interface goes down and on the disconnection from a +* BSS. Driver supporting this feature should advertise +* NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK and supporting per station +* TX bitrate configuration should advertise +* NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK. */ enum nl80211_tid_attr_config { __NL80211_TID_ATTR_INVALID,
@@ -4752,6 +4783,8 @@ enum nl80211_tid_attr_config {NL80211_TID_ATTR_CONFIG_RETRY_LONG ,NL80211_TID_ATTR_CONFIG_AMPDU_CTRL ,NL80211_TID_ATTR_CONFIG_RTSCTS_CTRL , +NL80211_TID_ATTR_CONFIG_TX_RATES_TYPE , +NL80211_TID_ATTR_CONFIG_TX_RATES ,/* keep last */ __NL80211_TID_ATTR_CONFIG_AFTER_LAST,
@@ -5585,6 +5618,10 @@ enum nl80211_feature_flags {* RTS_CTS control(enable/disable). * @NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL: Driver supports STA specific * RTS_CTS control(enable/disable). +* @NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK: Driver supports TID specific +* TX bitrate configuration. +* @NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK: Driver supports STA specific +* TX bitrate configuration. * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -5639,6 +5676,8 @@ enum nl80211_ext_feature_index {NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL ,NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL ,NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL , +NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK , +NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK ,/* add new features before the definition below */ NUM_NL80211_EXT_FEATURES,
net/wireless/nl80211.c +71 -6
137 lines not on this page · raw message
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCHv6 5/9] nl80211: Add netlink attribute to configure TID specific tx rate
Quoted 17 lines
Introduce
NL80211_TID_ATTR_CONFIG_TX_RATESinnl80211_tid_attr_configto accept data TID specific TX bitrate configuration
throughNL80211_CMD_SET_TID_CONFIGcommand. TID for which the this configuration is to be applied is passed inNL80211_TID_ATTR_CONFIG_TIDattribute. TX bitrate mask values passed inNL80211_ATTR_TX_RATESattribute andNL80211_TID_ATTR_CONFIG_TX_RATESattribute will have types of the TX rate should be applied. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed inNL80211_ATTR_MACattribute.Driver supporting this feature should advertise
NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASKand supporting per-STA data TID TX bitrate configuration should advertiseNL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK.Signed-off-by Tamizh chelvam <[email protected]>
...
net/wireless/nl80211.c static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) · line 4622
Quoted 8 lines
if (info->attrs[NL80211_ATTR_TX_RATES]) {net/wireless/nl80211.c +3
-1- err =nl80211_parse_tx_bitrate_mask (info, ¶ms.beacon_rate); + err =nl80211_parse_tx_bitrate_mask (info, info->attrs, +NL80211_ATTR_TX_RATES , + ¶ms.beacon_rate);if (err)return err;
Could you please clarify this change of nl80211_parse_tx_bitrate_mask arguments. Unless I missing something, the appropriate change for nl80211_parse_tx_bitrate_mask is not included into this patch set.
Regards,
Sergey
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCHv6 5/9] nl80211: Add netlink attribute to configure TID specific tx rate
Quoted 32 lines · Sergey Matyukevich
Quoted 17 lines
Introduce
NL80211_TID_ATTR_CONFIG_TX_RATESinnl80211_tid_attr_configto accept data TID specific TX bitrate configuration
throughNL80211_CMD_SET_TID_CONFIGcommand. TID for which the this configuration is to be applied is passed inNL80211_TID_ATTR_CONFIG_TIDattribute. TX bitrate mask values passed inNL80211_ATTR_TX_RATESattribute andNL80211_TID_ATTR_CONFIG_TX_RATESattribute will have types of the TX rate should be applied. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed inNL80211_ATTR_MACattribute.Driver supporting this feature should advertise
NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASKand supporting per-STA data TID TX bitrate configuration should advertiseNL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK.Signed-off-by Tamizh chelvam <[email protected]>...
Quoted 11 lines
if (info->attrs[NL80211_ATTR_TX_RATES]) {- err = nl80211_parse_tx_bitrate_mask(info,
¶ms.beacon_rate);(quoted diff) +2
-0+ err = nl80211_parse_tx_bitrate_mask(info, info->attrs, +
NL80211_ATTR_TX_RATES,
+¶ms.beacon_rate); if (err) return err;
Quoted 4 lines
Could you please clarify this change of
nl80211_parse_tx_bitrate_maskarguments. Unless I missing something, the appropriate change fornl80211_parse_tx_bitrate_mask
is not included into this patch set.
Yeah. These arguments are missed in the function definition place:( I will fix this rebase issue in next version.
Thanks,
Tamizh.
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCHv6 5/9] nl80211: Add netlink attribute to configure TID specific tx rate
In reply to Tamizh chelvaminclude/uapi/linux/nl80211.h enum nl80211_tx_power_setting { · line 4661
Quoted 12 lines
/**
+ * enumnl80211_tx_rate_setting- TX rate configuration type
+ * @NL80211_TX_RATE_AUTOMATIC: automatically determine TX rate
+ * @NL80211_TX_RATE_LIMITED: limit the TX rate by the TX rate parameter
+ * @NL80211_TX_RATE_FIXED: fix TX rate to the TX rate parameter
+ */include/uapi/linux/nl80211.h +5
-0+enum nl80211_tx_rate_setting { +NL80211_TX_RATE_AUTOMATIC , +NL80211_TX_RATE_LIMITED , +NL80211_TX_RATE_FIXED , +};
I'm not really quite sure how LIMITED it supposed to work?
I mean, I could imagine all kinds of limits ...
* limit to anything <= the given rate in kbps
* limit to anything with long GI
* limit to NSS <= given NSS
* limit to MCS <= given MCS
etc.
I guess you could find a <= comparison for each dimension of the various parameters, and then if you don't want that particular one limited you give the maximum? Still not really clear to me how that should work.
Also, would it be allowed to pass an invalid rate? Like something like "100Mbps legacy rate" when that's certainly not valid? You have no validation on this, so for LIMITED that might still seem useful (per my first bullet point above) but for anything else ... not so much?
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v6 6/9 mac80211: Add api to support configuring TID specific configuration
In reply to Tamizh chelvamImplement drv_set_tid_config api to allow TID specific configuration. This per-TID configuration
will be applied for all the connected stations when MAC is NULL.
--- include/net/mac80211.h | 38 ++++++++++++++++++++++++++++++++++++++ net/mac80211/cfg.c | 28 ++++++++++++++++++++++++++++ net/mac80211/driver-ops.h | 15 +++++++++++++++ 3 files changed, 81 insertions(+)
include/net/mac80211.h +38 -0
@@ -1563,6 +1563,8 @@ enum ieee80211_vif_flags { IEEE80211_VIF_GET_NOA_UPDATE = BIT(3), }; +#define IEEE80211_TID_MAX 8 +/** * struct ieee80211_vif - per-interface data *
@@ -1600,6 +1602,13 @@ enum ieee80211_vif_flags {* @txq: the multicast data TX queue (if driver uses the TXQ abstraction) * @txqs_stopped: per AC flag to indicate that intermediate TXQs are stopped, * protected by fq->lock. +* @noack: per-TID noack policy. +* @retry_short: per-TID retry count. +* @retry_long: per-TID count. +* @ampdu: per-TID Aggregation-MPDU. +* @rate_ctrl: per-TID tx rate control type. +* @rate_code: per-TID tx rate code mask. +* @rtscts: per-TID RTSCTS policy. */ struct ieee80211_vif {enum nl80211_iftype type;
@@ -1626,6 +1635,14 @@ struct ieee80211_vif {bool txqs_stopped[IEEE80211_NUM_ACS ]; +int noack[IEEE80211_TID_MAX ]; +int retry_short[IEEE80211_TID_MAX ]; +int retry_long[IEEE80211_TID_MAX ]; +int ampdu[IEEE80211_TID_MAX ]; +u8 rate_ctrl[IEEE80211_TID_MAX ]; +u32 rate_code[IEEE80211_TID_MAX ]; +u8 rtscts[IEEE80211_TID_MAX ]; +/* must be last */ u8 drv_priv[0 ]__aligned(sizeof(void *)) ; };
@@ -1960,6 +1977,12 @@ struct ieee80211_sta_txpwr {* @max_tid_amsdu_len: Maximum A-MSDU size in bytes for this TID * @txq: per-TID data TX queues (if driver uses the TXQ abstraction); note that * the last entry (%IEEE80211_NUM_TIDS) is used for non-data frames +* @noack: per-TID noack policy. +* @retry_short: per-TID retry count. +* @retry_long: per-TID count. +* @ampdu: per-TID Aggregation-MPDU. +* @rate_ctrl: per-TID tx rate control type. +* @rtscts: per-TID RTSCTS policy. */ struct ieee80211_sta {u32 supp_rates[NUM_NL80211_BANDS ];
@@ -2004,6 +2027,13 @@ struct ieee80211_sta {struct ieee80211_txq *txq[IEEE80211_NUM_TIDS +1 ]; +int noack[IEEE80211_TID_MAX ]; +int retry_short[IEEE80211_TID_MAX ]; +int retry_long[IEEE80211_TID_MAX ]; +int ampdu[IEEE80211_TID_MAX ]; +u8 rate_ctrl[IEEE80211_TID_MAX ]; +u8 rtscts[IEEE80211_TID_MAX ]; +/* must be last */ u8 drv_priv[0 ]__aligned(sizeof(void *)) ; };
@@ -3743,6 +3773,10 @@ enum ieee80211_reconfig_type {* * @start_pmsr: start peer measurement (e.g. FTM) (this call can sleep) * @abort_pmsr: abort peer measurement (this call can sleep) +* @set_tid_config: TID specific configurations will be applied for a particular +* station when @sta is non-NULL. When @sta is %NULL, then the configuration +* will be for all the connected clients in the vif. +* This callback may sleep. */ struct ieee80211_ops { void (*tx)(struct ieee80211_hw *hw,
@@ -4043,6 +4077,10 @@ struct ieee80211_ops { struct cfg80211_pmsr_request *request);void (*abort_pmsr)(struct ieee80211_hw *hw,struct ieee80211_vif *vif,struct cfg80211_pmsr_request *request); +int (*set_tid_config)(struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta, +struct ieee80211_tid_config *tid_conf); };/**
net/mac80211/cfg.c +28 -0
@@ -3940,6 +3940,33 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy,return drv_abort_pmsr (local, sdata, request); } +static int ieee80211_set_tid_config (struct wiphy *wiphy, +struct net_device *dev, +struct ieee80211_tid_config *tid_conf) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct sta_info *sta; +int ret; + +if (!sdata->local->ops->set_tid_config) +return -EOPNOTSUPP ; + +if (!tid_conf->peer) +return drv_set_tid_config (sdata->local, sdata,NULL , tid_conf); + +mutex_lock (&sdata->local->sta_mtx); + + sta =sta_info_get_bss (sdata, tid_conf->peer); +if (!sta) { +mutex_unlock (&sdata->local->sta_mtx); +return -ENOENT ; + } + + ret =drv_set_tid_config (sdata->local, sdata, &sta->sta, tid_conf); +mutex_unlock (&sdata->local->sta_mtx); +return ret; +} +const struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface,
@@ -4038,4 +4065,5 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy, .start_pmsr = ieee80211_start_pmsr, .abort_pmsr = ieee80211_abort_pmsr, .probe_mesh_link = ieee80211_probe_mesh_link, + .set_tid_config = ieee80211_set_tid_config, };
net/mac80211/driver-ops.h +15 -0
@@ -1356,4 +1356,19 @@ static inline void drv_del_nan_func(struct ieee80211_local *local, trace_drv_return_void(local); } +static inline int drv_set_tid_config (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata, +struct ieee80211_sta *sta, +struct ieee80211_tid_config *tid_conf) +{ +int ret; + +might_sleep (); + ret = local->ops->set_tid_config (&local->hw, &sdata->vif, sta, + tid_conf); +trace_drv_return_int (local, ret); + +return ret; +} +#endif /* __MAC80211_DRIVER_OPS */
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCHv6 6/9] mac80211: Add api to support configuring TID specific configuration
include/net/mac80211.h struct ieee80211_vif { · line 1644
Quoted 12 lines · Tamizh chelvam
include/net/mac80211.h +7
-0@@ -1626,6 +1635,14 @@ struct ieee80211_vif {bool txqs_stopped[IEEE80211_NUM_ACS ]; +int noack[IEEE80211_TID_MAX ]; +int retry_short[IEEE80211_TID_MAX ]; +int retry_long[IEEE80211_TID_MAX ]; +int ampdu[IEEE80211_TID_MAX ]; +u8 rate_ctrl[IEEE80211_TID_MAX ]; +u32 rate_code[IEEE80211_TID_MAX ]; +u8 rtscts[IEEE80211_TID_MAX ];
This is quite a bit of data (176 bytes), can we make it up to the driver to store it if supported, instead?
include/net/mac80211.h struct ieee80211_sta { · line 2035
Quoted 10 lines
include/net/mac80211.h +6
-0@@ -2004,6 +2027,13 @@ struct ieee80211_sta {struct ieee80211_txq *txq[IEEE80211_NUM_TIDS +1 ]; +int noack[IEEE80211_TID_MAX ]; +int retry_short[IEEE80211_TID_MAX ]; +int retry_long[IEEE80211_TID_MAX ]; +int ampdu[IEEE80211_TID_MAX ]; +u8 rate_ctrl[IEEE80211_TID_MAX ]; +u8 rtscts[IEEE80211_TID_MAX ];
same here.
Quoted 16 lines
net/mac80211/cfg.c +16
-0+static int ieee80211_set_tid_config (struct wiphy *wiphy, +struct net_device *dev, +struct ieee80211_tid_config *tid_conf) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct sta_info *sta; +int ret; + +if (!sdata->local->ops->set_tid_config) +return -EOPNOTSUPP ; + +if (!tid_conf->peer) +return drv_set_tid_config (sdata->local, sdata,NULL , tid_conf); + +mutex_lock (&sdata->local->sta_mtx); +
net/mac80211/cfg.c static int ieee80211_get_txq_stats(struct wiphy *wiphy, · line 3968
Quoted 10 lines
net/mac80211/cfg.c +10
-0+ sta =sta_info_get_bss (sdata, tid_conf->peer); +if (!sta) { +mutex_unlock (&sdata->local->sta_mtx); +return -ENOENT ; + } + + ret =drv_set_tid_config (sdata->local, sdata, &sta->sta, tid_conf); +mutex_unlock (&sdata->local->sta_mtx); +return ret; +}
and you're not actually using the data anyway?
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v6 7/9 ath10k: Add wmi command support for station specific TID config
In reply to Tamizh chelvamThis patch adds WMI interface to configure station specific TID configuration . Host needs to send station's MAC address along with TID number and its configuration to target through WMI_10_4_PER_PEER_PER_TID_CONFIG_CMDID.
WMI_SERVICE_PEER_TID_CONFIGS_SUPPORT flag is added to advertise this support.
Testing:
* Tested HW: QCA9888
* Tested FW: 10.4-3.5.1-00052
--- drivers/net/wireless/ath/ath10k/wmi-ops.h | 19 +++++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 32 ++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.h | 52 +++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+)
drivers/net/wireless/ath/ath10k/wmi-ops.h +19 -0
@@ -216,6 +216,8 @@ struct wmi_ops {struct sk_buff *(*gen_bb_timing) (struct ath10k *ar,const struct wmi_bb_timing_cfg_arg *arg); +struct sk_buff *(*gen_per_peer_per_tid_cfg)(struct ath10k *ar, +const struct wmi_per_peer_per_tid_cfg_arg *arg); };
@@ -1616,4 +1618,21 @@ struct wmi_ops {return ath10k_wmi_cmd_send (ar, skb, ar->wmi.cmd->set_bb_timing_cmdid); } + +static inline int +ath10k_wmi_set_per_peer_per_tid_cfg (struct ath10k *ar, +const struct wmi_per_peer_per_tid_cfg_arg *arg) +{ +struct sk_buff *skb; + +if (!ar->wmi.ops->gen_per_peer_per_tid_cfg) +return -EOPNOTSUPP ; + + skb = ar->wmi.ops->gen_per_peer_per_tid_cfg (ar, arg); +if (IS_ERR (skb)) +return PTR_ERR (skb); + +return ath10k_wmi_cmd_send (ar, skb, + ar->wmi.cmd->per_peer_per_tid_config_cmdid); +}#endif
drivers/net/wireless/ath/ath10k/wmi.c +32 -0
@@ -740,6 +740,7 @@ .tdls_peer_update_cmdid = WMI_10_4_TDLS_PEER_UPDATE_CMDID, .tdls_set_offchan_mode_cmdid = WMI_10_4_TDLS_SET_OFFCHAN_MODE_CMDID, .radar_found_cmdid = WMI_10_4_RADAR_FOUND_CMDID, + .per_peer_per_tid_config_cmdid = WMI_10_4_PER_PEER_PER_TID_CONFIG_CMDID, };/* MAIN WMI VDEV param map */
@@ -8880,6 +8881,36 @@ static u32 ath10k_wmi_prepare_peer_qos(u8 uapsd_queues, u8 sp) }static struct sk_buff * +ath10k_wmi_10_4_gen_per_peer_per_tid_cfg (struct ath10k *ar, +const struct wmi_per_peer_per_tid_cfg_arg *arg) +{ +struct wmi_peer_per_tid_cfg_cmd *cmd; +struct sk_buff *skb; + + skb =ath10k_wmi_alloc_skb (ar,sizeof (*cmd)); +if (!skb) +return ERR_PTR (-ENOMEM ); + +memset (skb->data,0 ,sizeof (*cmd)); + + cmd = (struct wmi_peer_per_tid_cfg_cmd *)skb->data; + cmd->vdev_id =cpu_to_le32 (arg->vdev_id); +ether_addr_copy (cmd->peer_macaddr.addr, arg->peer_macaddr.addr); + cmd->tid =cpu_to_le32 (arg->tid); + cmd->ack_policy =cpu_to_le32 (arg->ack_policy); + cmd->aggr_control =cpu_to_le32 (arg->aggr_control); + cmd->rate_control =cpu_to_le32 (arg->rate_ctrl); + cmd->retry_count =cpu_to_le32 (arg->retry_count); + cmd->rcode_flags =cpu_to_le32 (arg->rcode_flags); + +ath10k_dbg (ar,ATH10K_DBG_WMI , +"wmi noack tid %d vdev id %d ack_policy %d aggr %u rate_ctrl %u rcflag %u retry_count %d mac_addr %pM\n" , + arg->tid, arg->vdev_id, arg->ack_policy, arg->aggr_control, arg->rate_ctrl, + arg->rcode_flags, arg->retry_count, arg->peer_macaddr.addr); +return skb; +} + +static struct sk_buff *ath10k_wmi_op_gen_echo (struct ath10k *ar,u32 value) {struct wmi_echo_cmd *cmd;
@@ -9288,6 +9319,7 @@ static u32 ath10k_wmi_prepare_peer_qos(u8 uapsd_queues, u8 sp) .gen_pdev_get_tpc_table_cmdid = ath10k_wmi_10_4_op_gen_pdev_get_tpc_table_cmdid, .gen_radar_found = ath10k_wmi_10_4_gen_radar_found, + .gen_per_peer_per_tid_cfg = ath10k_wmi_10_4_gen_per_peer_per_tid_cfg,/* shared with 10.2 */ .pull_echo_ev = ath10k_wmi_op_pull_echo_ev,
drivers/net/wireless/ath/ath10k/wmi.h +52 -0
88 lines not on this page · raw message
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v6 8/9 ath10k: Add new api to support TID specific configuration
In reply to Tamizh chelvamThis patch add ops for set_tid_config to support TID specific configuration. STA information along with the TID config change mask to notify driver that which configuration needs to be applied for this current command.
If the STA info not available in the command then the configuration will be applied for all connected stations in the vif. TID specific noack configuration requires aggregation disabled and rate for the data TID packets should be basic rates. So, if the TID already configured with noack policy then driver will ignore the aggregation or TX rate related configuration for the same data TID. In TX rate configuration should be applied with highest preamble configuration(HT rates should not be applied for the station which supports vht rates).
Vif specific TID configuration will be applied for all the connected stations except for the station which already applied with the same configuration for the TID through station specific command. Newly connecting stations will be applied with vif TID configuration which will be stored in ieee80211_vif.
Testing:
* Tested HW: QCA9888
* Tested FW: 10.4-3.5.1-00052
--- drivers/net/wireless/ath/ath10k/core.h | 6 + drivers/net/wireless/ath/ath10k/mac.c | 633 ++++++++++++++++++++++++++++---- 2 files changed, 559 insertions(+), 80 deletions(-)
drivers/net/wireless/ath/ath10k/core.h +6 -0
@@ -82,6 +82,8 @@/* Default Airtime weight multipler (Tuned for multiclient performance) */ #define ATH10K_AIRTIME_WEIGHT_MULTIPLIER 4 +#define ATH10K_MAX_RETRY_COUNT 29 +struct ath10k ;static inline const char *ath10k_bus_str (enum ath10k_bus bus)
@@ -504,6 +506,7 @@ struct ath10k_sta {#endif /* Protected with ar->data_lock */ u32 peer_ps_state; +struct work_struct tid_config_wk; };#define ATH10K_VDEV_SETUP_TIMEOUT_HZ (5 * HZ)
@@ -571,6 +574,9 @@ struct ath10k_vif {struct work_struct ap_csa_work;struct delayed_work connection_loss_work;struct cfg80211_bitrate_mask bitrate_mask; +u32 tid_conf_changed[IEEE80211_TID_MAX ]; + +struct ieee80211_tid_config *tid_config; };struct ath10k_vif_iter {
drivers/net/wireless/ath/ath10k/mac.c +553 -80
694 lines not on this page · raw message
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v6 9/9 ath10k: Add extended TID configuration support
In reply to Tamizh chelvamThis patch extend TID configuration support to configure RTS_CTS control and TX rate limit. Tx rate limit is similar to auto rate but it will be limited to the user configured rate mask rather than the station's highest supported rate mask. Here ext_tid_cfg_bitmap added to notify the target which extended configuration parameter has modified(here RTS_CTS).
WMI_10_4_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT service flag introduced to advertise this support.
Testing:
* Tested HW: QCA9984
* Tested FW: 10.4-3.9.0.2-00021
--- drivers/net/wireless/ath/ath10k/core.c | 4 +++ drivers/net/wireless/ath/ath10k/mac.c | 48 ++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 9 ++++-- drivers/net/wireless/ath/ath10k/wmi.h | 20 +++++++++++++ 4 files changed, 78 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +4 -0
@@ -2636,6 +2636,10 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,if (test_bit (WMI_SERVICE_REPORT_AIRTIME , ar->wmi.svc_map)) val |=WMI_10_4_REPORT_AIRTIME ; +if (test_bit (WMI_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT , + ar->wmi.svc_map)) + val |=WMI_10_4_EXT_PEER_TID_CONFIGS_SUPPORT ; + status =ath10k_mac_ext_resource_config (ar, val);if (status) { ath10k_err(ar,
drivers/net/wireless/ath/ath10k/mac.c +48 -0
90 lines not on this page · raw message
drivers/net/wireless/ath/ath10k/wmi.c +6 -3
@@ -8902,11 +8902,14 @@ static u32 ath10k_wmi_prepare_peer_qos(u8 uapsd_queues, u8 sp) cmd->rate_control =cpu_to_le32 (arg->rate_ctrl); cmd->retry_count =cpu_to_le32 (arg->retry_count); cmd->rcode_flags =cpu_to_le32 (arg->rcode_flags); + cmd->ext_tid_cfg_bitmap =cpu_to_le32 (arg->ext_tid_cfg_bitmap); + cmd->rtscts_ctrl =cpu_to_le32 (arg->rtscts_ctrl);ath10k_dbg (ar,ATH10K_DBG_WMI , -"wmi noack tid %d vdev id %d ack_policy %d aggr %u rate_ctrl %u rcflag %u retry_count %d mac_addr %pM\n" , - arg->tid, arg->vdev_id, arg->ack_policy, arg->aggr_control, arg->rate_ctrl, - arg->rcode_flags, arg->retry_count, arg->peer_macaddr.addr); +"wmi noack tid %d vdev id %d ack_policy %d aggr %u rate_ctrl %u rcflag %u retry_count %d rtscts %d ext_tid_cfg_bitmap %d mac_addr %pM\n" , + arg->tid, arg->vdev_id, arg->ack_policy, arg->aggr_control, + arg->rate_ctrl, arg->rcode_flags, arg->retry_count, arg->rtscts_ctrl, + arg->ext_tid_cfg_bitmap, arg->peer_macaddr.addr);return skb; }
drivers/net/wireless/ath/ath10k/wmi.h +20 -0
@@ -201,6 +201,7 @@ enum wmi_service {WMI_SERVICE_PER_PACKET_SW_ENCRYPT ,WMI_SERVICE_REPORT_AIRTIME ,WMI_SERVICE_PEER_TID_CONFIGS_SUPPORT , + WMI_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT,/* Remember to add the new value to wmi_service_name()! */
@@ -493,6 +494,7 @@ static inline char *wmi_service_name(enum wmi_service service_id)SVCSTR (WMI_SERVICE_PER_PACKET_SW_ENCRYPT );SVCSTR (WMI_SERVICE_REPORT_AIRTIME );SVCSTR (WMI_SERVICE_PEER_TID_CONFIGS_SUPPORT ); +SVCSTR (WMI_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT );case WMI_SERVICE_MAX :return NULL ;
@@ -822,6 +824,8 @@ static inline void wmi_10_4_svc_map(const __le32 *in, unsigned long *out, WMI_SERVICE_REPORT_AIRTIME, len);SVCMAP (WMI_10_4_SERVICE_PEER_TID_CONFIGS_SUPPORT ,WMI_SERVICE_PEER_TID_CONFIGS_SUPPORT , len); +SVCMAP (WMI_10_4_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT , +WMI_SERVICE_EXT_PEER_TID_CONFIGS_SUPPORT , len); }#undef SVCMAP
@@ -7188,6 +7192,16 @@ enum wmi_tid_rate_ctrl_conf {WMI_TID_CONFIG_RATE_CONTROL_AUTO ,WMI_TID_CONFIG_RATE_CONTROL_FIXED_RATE ,WMI_TID_CONFIG_RATE_CONTROL_DEFAULT_LOWEST_RATE , + WMI_PEER_TID_CONFIG_RATE_UPPER_CAP, +}; + +enum wmi_tid_rtscts_control_conf { +WMI_TID_CONFIG_RTSCTS_CONTROL_ENABLE , +WMI_TID_CONFIG_RTSCTS_CONTROL_DISABLE , +}; + +enum wmi_ext_tid_config_map { +WMI_EXT_TID_RTS_CTS_CONFIG =BIT (0 ), }; struct wmi_per_peer_per_tid_cfg_arg {
@@ -7199,6 +7213,8 @@ struct wmi_per_peer_per_tid_cfg_arg {u8 rate_ctrl;u32 retry_count;u32 rcode_flags; +u32 ext_tid_cfg_bitmap; +u32 rtscts_ctrl; };struct wmi_peer_per_tid_cfg_cmd {
@@ -7214,6 +7230,10 @@ struct wmi_peer_per_tid_cfg_cmd {__le32 rate_control;__le32 rcode_flags;__le32 retry_count; +/* See enum wmi_ext_tid_config_map */ +__le32 ext_tid_cfg_bitmap; +/* see enum wmi_tid_rtscts_control_conf */ +__le32 rtscts_ctrl; } __packed;enum wmi_txbf_conf {
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k