dt-bindings: ath10k: Add new dt entries to identify coex support
Subsystems (3)
PATCH v2 1/2 dt-bindings: ath10k: Add new dt entries to identify coex support
This adds new dt entries qcom,coexist-support and qcom,coexist-gpio-pin which will be used by ath10k driver to identify coex support of a hardware and notify wifi firmware the gpio pin number. This pin number information is needed for the hardware QCA4019.
--- Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt +7 -0
@@ -91,6 +91,11 @@ Optional properties: - qcom,msa-fixed-perm: Boolean context flag to disable SCM call for statically mapped msa region. +- qcom,coexist-support : should contain eithr "0" or "1" to indicate coex + support by the hardware. +- qcom,coexist-gpio-pin : gpio pin number information to support coex + which will be used by wifi firmware. + Example (to supply PCI based wifi block details): In this example, the node is defined as child node of the PCI controller.
@@ -159,6 +164,8 @@ wifi0: wifi@a000000 { qcom,msi_addr = <0x0b006040>; qcom,msi_base = <0x40>; qcom,ath10k-pre-calibration-data = [ 01 02 03 ... ]; + qcom,coexist-support = <1>; + qcom,coexist-gpio-pin = <0x33>; }; Example (to supply wcn3990 SoC wifi block details):
Signature · 6 lines
1.9.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v2 2/2 ath10k: Add support to read btcoex related data from DT
BTCOEX feature is not supported by all QCA4019 chipsets. Since btcoex enabled by default in firmware, host needs to enable COEX support depends on the hardware. Enabling it by default in unsupported hardware will cause some feature disabled in hardware.
This patch will read btcoex_support flag and
wlan priority gpio pin number from DT. Depends on the btcoex_support flag value host will expose BTCOEX support and wlan priority gpio pin number to target.
Testing:
* Tested HW : QCA4019
* Tested FW : 10.4-3.2.1.1-00017
---
v2:
* Changed coex_support to bool type
drivers/net/wireless/ath/ath10k/core.c | 44 ++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/core.h | 3 +++ drivers/net/wireless/ath/ath10k/debug.c | 3 +++ drivers/net/wireless/ath/ath10k/mac.c | 3 ++- drivers/net/wireless/ath/ath10k/wmi.c | 2 +- 5 files changed, 52 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +43 -1
@@ -2119,6 +2119,40 @@ static int ath10k_download_cal_data(struct ath10k *ar)return 0 ; } +static void ath10k_core_fetch_btcoex_dt (struct ath10k *ar) +{ +struct device_node *node; +u8 coex_support =0 ; +int ret; + + node = ar->dev->of_node; +if (!node) + goto out; + + ret =of_property_read_u8 (node,"qcom,coexist-support" , &coex_support); +if (ret) { + ar->coex_support = true; + goto out; + } + +if (coex_support) { + ar->coex_support = true; + }else { + ar->coex_support = false; + ar->coex_gpio_pin =-1 ; + goto out; + } + + ret =of_property_read_u32 (node,"qcom,coexist-gpio-pin" , + &ar->coex_gpio_pin); +if (ret) + ar->coex_gpio_pin =-1 ; + +out: +ath10k_dbg (ar,ATH10K_DBG_BOOT ,"boot coex_support %d coex_gpio_pin %d\n" , + ar->coex_support, ar->coex_gpio_pin); +} +static int ath10k_init_uart (struct ath10k *ar) {int ret;
@@ -2696,14 +2730,22 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,if (test_bit (WMI_SERVICE_BSS_CHANNEL_INFO_64 , ar->wmi.svc_map)) val |=WMI_10_4_BSS_CHANNEL_INFO_64 ; +ath10k_core_fetch_btcoex_dt (ar); +/* 10.4 firmware supports BT-Coex without reloading firmware * via pdev param. To support Bluetooth coexistence pdev param, * WMI_COEX_GPIO_SUPPORT of extended resource config should be * enabled always. +* +* We can still enable BTCOEX if firmware has the support +* eventhough btceox_support value is +* ATH10K_DT_BTCOEX_NOT_FOUND */ +if (test_bit (WMI_SERVICE_COEX_GPIO , ar->wmi.svc_map) &&test_bit (ATH10K_FW_FEATURE_BTCOEX_PARAM , - ar->running_fw->fw_file.fw_features)) + ar->running_fw->fw_file.fw_features) && + ar->coex_support) val |=WMI_10_4_COEX_GPIO_SUPPORT ; if (test_bit(WMI_SERVICE_TDLS_EXPLICIT_MODE_ONLY,
drivers/net/wireless/ath/ath10k/core.h +3 -0
@@ -1222,6 +1222,9 @@ struct ath10k {struct ath10k_bus_params bus_param;struct completion peer_delete_done; +bool coex_support; +int coex_gpio_pin; +/* must be last */ u8 drv_priv[0 ]__aligned(sizeof(void *)) ; };
drivers/net/wireless/ath/ath10k/debug.c +3 -0
@@ -1978,6 +1978,9 @@ static ssize_t ath10k_write_btcoex(struct file *file,if (strtobool (buf, &val) !=0 )return -EINVAL ; +if (!ar->coex_support) +return -EOPNOTSUPP ; +mutex_lock (&ar->conf_mutex); if (ar->state != ATH10K_STATE_ON &&
drivers/net/wireless/ath/ath10k/mac.c +2 -1
@@ -4982,7 +4982,8 @@ static int ath10k_start(struct ieee80211_hw *hw) param = ar->wmi.pdev_param->enable_btcoex;if (test_bit (WMI_SERVICE_COEX_GPIO , ar->wmi.svc_map) &&test_bit (ATH10K_FW_FEATURE_BTCOEX_PARAM , - ar->running_fw->fw_file.fw_features)) { + ar->running_fw->fw_file.fw_features) && + ar->coex_support) { ret =ath10k_wmi_pdev_set_param (ar, param,0 );if (ret) { ath10k_warn(ar,
drivers/net/wireless/ath/ath10k/wmi.c +1 -1
@@ -8787,7 +8787,7 @@ static int ath10k_wmi_10_4_op_get_vdev_subtype(struct ath10k *ar, cmd = (struct wmi_ext_resource_config_10_4_cmd *)skb->data; cmd->host_platform_config =__cpu_to_le32 (type); cmd->fw_feature_bitmap =__cpu_to_le32 (fw_feature_bitmap); - cmd->wlan_gpio_priority =__cpu_to_le32 (-1 ); + cmd->wlan_gpio_priority =__cpu_to_le32 (ar->coex_gpio_pin); cmd->coex_version =__cpu_to_le32 (WMI_NO_COEX_VERSION_SUPPORT ); cmd->coex_gpio_pin1 =__cpu_to_le32 (-1 ); cmd->coex_gpio_pin2 =__cpu_to_le32 (-1 );
Signature · 1 line
1.9.1
Quoted 10 lines · Tamizh Chelvam
This adds new dt entries qcom,coexist-support and qcom,coexist-gpio-pin which will be used by ath10k driver to identify coex support of a hardware and notify wifi firmware the gpio pin number. This pin number information is needed for the hardware QCA4019.
Signed-off-by Tamizh Chelvam <[email protected]>--- Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt | 7 +++++++ 1 file changed, 7 insertions(+)
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 8 lines · Tamizh Chelvam
This adds new dt entries qcom,coexist-support and qcom,coexist-gpio-pin which will be used by ath10k driver to identify coex support of a hardware and notify wifi firmware the gpio pin number. This pin number information is needed for the hardware QCA4019.
Signed-off-by Tamizh Chelvam <[email protected]>Reviewed-by Rob Herring <[email protected]>Signed-off-by Kalle Valo <[email protected]>
2 patches applied to ath-next branch of ath.git, thanks.
7354de9c6e2c dt-bindings: ath10k: Add new dt entries to identify coex support 9f83993e1a92 ath10k: Add support to read btcoex related data from DT
Signature · 3 lines
https://patchwork.kernel.org/patch/11353153/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 8 lines · Tamizh Chelvam
This adds new dt entries qcom,coexist-support and qcom,coexist-gpio-pin which will be used by ath10k driver to identify coex support of a hardware and notify wifi firmware the gpio pin number. This pin number information is needed for the hardware QCA4019.
Signed-off-by Tamizh Chelvam <[email protected]>Reviewed-by Rob Herring <[email protected]>Signed-off-by Kalle Valo <[email protected]>
2 patches applied to ath-next branch of ath.git, thanks.
7354de9c6e2c dt-bindings: ath10k: Add new dt entries to identify coex support 9f83993e1a92 ath10k: Add support to read btcoex related data from DT
Signature · 8 lines
https://patchwork.kernel.org/patch/11353153/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k