2014-08-19 11:32:23

by Michal Kazior

Subject: [PATCH] ath10k: fix wmi service bitmap

Service mapping for main firmware branch was
incorrectly used for 10.x firmware and vice-versa.
This caused wmi_services in debugfs to print wrong
values.

This actually fixes a problem with the previous
wmi service bitmap patch itself. For some reason
there was either a conflict that wasn't resolved
properly or git had a bad day.

Signed-off-by: Michal Kazior <[email protected]>
---
drivers/net/wireless/ath/ath10k/wmi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 23acbad..ec3bf4e 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2194,7 +2194,7 @@ static void ath10k_wmi_service_ready_event_rx(struct ath10k *ar,
ar->ath_common.regulatory.current_rd =
__le32_to_cpu(ev->hal_reg_capabilities.eeprom_rd);

- wmi_10x_svc_map(ev->wmi_service_bitmap, svc_bmap);
+ wmi_main_svc_map(ev->wmi_service_bitmap, svc_bmap);
ath10k_debug_read_service_map(ar, svc_bmap, sizeof(svc_bmap));
ath10k_dbg_dump(ATH10K_DBG_WMI, NULL, "ath10k: wmi svc: ",
ev->wmi_service_bitmap, sizeof(ev->wmi_service_bitmap));
@@ -2264,7 +2264,7 @@ static void ath10k_wmi_10x_service_ready_event_rx(struct ath10k *ar,
ar->ath_common.regulatory.current_rd =
__le32_to_cpu(ev->hal_reg_capabilities.eeprom_rd);

- wmi_main_svc_map(ev->wmi_service_bitmap, svc_bmap);
+ wmi_10x_svc_map(ev->wmi_service_bitmap, svc_bmap);
ath10k_debug_read_service_map(ar, svc_bmap, sizeof(svc_bmap));
ath10k_dbg_dump(ATH10K_DBG_WMI, NULL, "ath10k: wmi svc: ",
ev->wmi_service_bitmap, sizeof(ev->wmi_service_bitmap));
--
1.8.5.3

2014-08-25 08:22:52

by Kalle Valo

Subject: Re: [PATCH] ath10k: fix wmi service bitmap

Michal Kazior <[email protected]> writes:

> Service mapping for main firmware branch was
> incorrectly used for 10.x firmware and vice-versa.
> This caused wmi_services in debugfs to print wrong
> values.
>
> This actually fixes a problem with the previous
> wmi service bitmap patch itself. For some reason
> there was either a conflict that wasn't resolved
> properly or git had a bad day.
>
> Signed-off-by: Michal Kazior <[email protected]>

Thanks, applied. I just changed the commit log a bit:

ath10k: fix a conflict bug in wmi service bitmap

Service mapping for main firmware branch was incorrectly used for 10.x firmware
and vice-versa. This caused wmi_services in debugfs to print wrong values.

This fixes commit cff990ce7ddd6 ("ath10k: fix wmi service bitmap debug") where
for some reason there was either a conflict that wasn't resolved properly or
git had a bad day.

Signed-off-by: Michal Kazior <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>


--
Kalle Valo