All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ath10k: Add thermal throttling support for 10.4 firmware.
@ 2015-10-29  8:53 ` c_traja
  0 siblings, 0 replies; 8+ messages in thread
From: c_traja @ 2015-10-29  8:53 UTC (permalink / raw)
  To: ath10k; +Cc: linux-wireless, Tamizh chelvam

From: Tamizh chelvam <c_traja@qti.qualcomm.com>

This patch enables thermal throttling support for 10.4 firmware.

Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/thermal.c |    2 +-
 drivers/net/wireless/ath/ath10k/wmi.c     |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c
index 60fe562..444b52c 100644
--- a/drivers/net/wireless/ath/ath10k/thermal.c
+++ b/drivers/net/wireless/ath/ath10k/thermal.c
@@ -187,7 +187,7 @@ int ath10k_thermal_register(struct ath10k *ar)
 	/* Do not register hwmon device when temperature reading is not
 	 * supported by firmware
 	 */
-	if (ar->wmi.op_version != ATH10K_FW_WMI_OP_VERSION_10_2_4)
+	if (!(ar->wmi.ops->gen_pdev_get_temperature))
 		return 0;
 
 	/* Avoid linking error on devm_hwmon_device_register_with_groups, I
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 2b32f02..3e45770 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -4935,6 +4935,9 @@ static void ath10k_wmi_10_4_op_rx(struct ath10k *ar, struct sk_buff *skb)
 		ath10k_dbg(ar, ATH10K_DBG_WMI,
 			   "received event id %d not implemented\n", id);
 		break;
+	case WMI_10_4_PDEV_TEMPERATURE_EVENTID:
+		ath10k_wmi_event_temperature(ar, skb);
+		break;
 	default:
 		ath10k_warn(ar, "Unknown eventid: %d\n", id);
 		break;
@@ -7344,6 +7347,7 @@ static const struct wmi_ops wmi_10_4_ops = {
 
 	/* shared with 10.2 */
 	.gen_peer_assoc = ath10k_wmi_10_2_op_gen_peer_assoc,
+	.gen_pdev_get_temperature = ath10k_wmi_10_2_op_gen_pdev_get_temperature,
 };
 
 int ath10k_wmi_attach(struct ath10k *ar)
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH] ath10k: Add thermal throttling support for 10.4 firmware.
@ 2015-10-29  8:53 ` c_traja
  0 siblings, 0 replies; 8+ messages in thread
From: c_traja @ 2015-10-29  8:53 UTC (permalink / raw)
  To: ath10k; +Cc: Tamizh chelvam, linux-wireless

From: Tamizh chelvam <c_traja@qti.qualcomm.com>

This patch enables thermal throttling support for 10.4 firmware.

Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/thermal.c |    2 +-
 drivers/net/wireless/ath/ath10k/wmi.c     |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c
index 60fe562..444b52c 100644
--- a/drivers/net/wireless/ath/ath10k/thermal.c
+++ b/drivers/net/wireless/ath/ath10k/thermal.c
@@ -187,7 +187,7 @@ int ath10k_thermal_register(struct ath10k *ar)
 	/* Do not register hwmon device when temperature reading is not
 	 * supported by firmware
 	 */
-	if (ar->wmi.op_version != ATH10K_FW_WMI_OP_VERSION_10_2_4)
+	if (!(ar->wmi.ops->gen_pdev_get_temperature))
 		return 0;
 
 	/* Avoid linking error on devm_hwmon_device_register_with_groups, I
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 2b32f02..3e45770 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -4935,6 +4935,9 @@ static void ath10k_wmi_10_4_op_rx(struct ath10k *ar, struct sk_buff *skb)
 		ath10k_dbg(ar, ATH10K_DBG_WMI,
 			   "received event id %d not implemented\n", id);
 		break;
+	case WMI_10_4_PDEV_TEMPERATURE_EVENTID:
+		ath10k_wmi_event_temperature(ar, skb);
+		break;
 	default:
 		ath10k_warn(ar, "Unknown eventid: %d\n", id);
 		break;
@@ -7344,6 +7347,7 @@ static const struct wmi_ops wmi_10_4_ops = {
 
 	/* shared with 10.2 */
 	.gen_peer_assoc = ath10k_wmi_10_2_op_gen_peer_assoc,
+	.gen_pdev_get_temperature = ath10k_wmi_10_2_op_gen_pdev_get_temperature,
 };
 
 int ath10k_wmi_attach(struct ath10k *ar)
-- 
1.7.9.5


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Add thermal throttling support for 10.4 firmware.
  2015-10-29  8:53 ` c_traja
@ 2015-10-31  9:37   ` Kalle Valo
  -1 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2015-10-31  9:37 UTC (permalink / raw)
  To: c_traja; +Cc: ath10k, linux-wireless

<c_traja@qti.qualcomm.com> writes:

> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>
> This patch enables thermal throttling support for 10.4 firmware.
>
> Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>

There was a trivial conflict, please check my conflict resolution in the
pending branch:

https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=6a3b459d9bb84bf6ae02cef084895898b18316a4

-- 
Kalle Valo

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Add thermal throttling support for 10.4 firmware.
@ 2015-10-31  9:37   ` Kalle Valo
  0 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2015-10-31  9:37 UTC (permalink / raw)
  To: c_traja; +Cc: linux-wireless, ath10k

<c_traja@qti.qualcomm.com> writes:

> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>
> This patch enables thermal throttling support for 10.4 firmware.
>
> Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>

There was a trivial conflict, please check my conflict resolution in the
pending branch:

https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=6a3b459d9bb84bf6ae02cef084895898b18316a4

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

^ permalink raw reply	[flat|nested] 8+ messages in thread
* RE: [PATCH] ath10k: Add thermal throttling support for 10.4 firmware.
  2015-10-31  9:37   ` Kalle Valo
@ 2015-11-04  5:13     ` Raja, Tamizh Chelvam
  -1 siblings, 0 replies; 8+ messages in thread
From: Raja, Tamizh Chelvam @ 2015-11-04  5:13 UTC (permalink / raw)
  To: Valo, Kalle; +Cc: ath10k, linux-wireless

>> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>>
>> This patch enables thermal throttling support for 10.4 firmware.
>>
>> Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>

>There was a trivial conflict, please check my conflict resolution in the pending branch:

>https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=6a3b459d9bb84bf6ae02cef084895898b18316a4

Looks good.

^ permalink raw reply	[flat|nested] 8+ messages in thread
* RE: [PATCH] ath10k: Add thermal throttling support for 10.4 firmware.
@ 2015-11-04  5:13     ` Raja, Tamizh Chelvam
  0 siblings, 0 replies; 8+ messages in thread
From: Raja, Tamizh Chelvam @ 2015-11-04  5:13 UTC (permalink / raw)
  To: Valo, Kalle; +Cc: linux-wireless, ath10k

>> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>>
>> This patch enables thermal throttling support for 10.4 firmware.
>>
>> Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>

>There was a trivial conflict, please check my conflict resolution in the pending branch:

>https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=6a3b459d9bb84bf6ae02cef084895898b18316a4

Looks good.

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Add thermal throttling support for 10.4 firmware.
  2015-10-29  8:53 ` c_traja
@ 2015-11-04 17:33   ` Kalle Valo
  -1 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2015-11-04 17:33 UTC (permalink / raw)
  To: c_traja; +Cc: ath10k, linux-wireless

<c_traja@qti.qualcomm.com> writes:

> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>
> This patch enables thermal throttling support for 10.4 firmware.
>
> Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>

Applied, thanks.

-- 
Kalle Valo

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] ath10k: Add thermal throttling support for 10.4 firmware.
@ 2015-11-04 17:33   ` Kalle Valo
  0 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2015-11-04 17:33 UTC (permalink / raw)
  To: c_traja; +Cc: linux-wireless, ath10k

<c_traja@qti.qualcomm.com> writes:

> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>
> This patch enables thermal throttling support for 10.4 firmware.
>
> Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>

Applied, thanks.

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-11-04 17:34 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-29  8:53 [PATCH] ath10k: Add thermal throttling support for 10.4 firmware c_traja
2015-10-29  8:53 ` c_traja
2015-10-31  9:37 ` Kalle Valo
2015-10-31  9:37   ` Kalle Valo
2015-11-04  5:13   ` Raja, Tamizh Chelvam
2015-11-04  5:13     ` Raja, Tamizh Chelvam
2015-11-04 17:33 ` Kalle Valo
2015-11-04 17:33   ` Kalle Valo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.