Commit f654e228 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'ath-next-20240305' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath 

ath.git patches for v6.9

Only some minor cleanup in ath11k and ath12k. Adding Jeff as the
maintainer for ath10k, ath11k and ath12k DT bindings.
parents 4dc38e39 776c9c93

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ title: Qualcomm Technologies ath10k wireless devices 


maintainers:

  - Kalle Valo <kvalo@kernel.org>

  - Jeff Johnson <jjohnson@kernel.org>



description:

  Qualcomm Technologies, Inc. IEEE 802.11ac devices.

Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ title: Qualcomm Technologies ath11k wireless devices (PCIe) 


maintainers:

  - Kalle Valo <kvalo@kernel.org>

  - Jeff Johnson <jjohnson@kernel.org>



description: |

  Qualcomm Technologies IEEE 802.11ax PCIe devices

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ title: Qualcomm Technologies ath11k wireless devices 


maintainers:

  - Kalle Valo <kvalo@kernel.org>

  - Jeff Johnson <jjohnson@kernel.org>



description: |

  These are dt entries for Qualcomm Technologies, Inc. IEEE 802.11ax

drivers/net/wireless/ath/ath11k/core.c

+5 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause-Clear

/*

 * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/module.h>
@@ -1869,10 +1869,9 @@ static int ath11k_core_reconfigure_on_crash(struct ath11k_base *ab) 


	mutex_lock(&ab->core_lock);

	ath11k_thermal_unregister(ab);

	ath11k_hif_irq_disable(ab);

	ath11k_dp_pdev_free(ab);

	ath11k_spectral_deinit(ab);

	ath11k_hif_stop(ab);

	ath11k_ce_cleanup_pipes(ab);

	ath11k_wmi_detach(ab);

	ath11k_dp_pdev_reo_cleanup(ab);

	mutex_unlock(&ab->core_lock);
@@ -2127,6 +2126,9 @@ static void ath11k_core_reset(struct work_struct *work) 
	time_left = wait_for_completion_timeout(&ab->recovery_start,

						ATH11K_RECOVER_START_TIMEOUT_HZ);



	ath11k_hif_irq_disable(ab);

	ath11k_hif_ce_irq_disable(ab);



	ath11k_hif_power_down(ab);

	ath11k_hif_power_up(ab);

drivers/net/wireless/ath/ath11k/mhi.c

+6 −62
Original line number Diff line number Diff line
@@ -20,35 +20,7 @@ 
#define MHI_TIMEOUT_DEFAULT_MS	20000

#define RDDM_DUMP_SIZE	0x420000



static struct mhi_channel_config ath11k_mhi_channels_qca6390[] = {

	{

		.num = 0,

		.name = "LOOPBACK",

		.num_elements = 32,

		.event_ring = 0,

		.dir = DMA_TO_DEVICE,

		.ee_mask = 0x4,

		.pollcfg = 0,

		.doorbell = MHI_DB_BRST_DISABLE,

		.lpm_notify = false,

		.offload_channel = false,

		.doorbell_mode_switch = false,

		.auto_queue = false,

	},

	{

		.num = 1,

		.name = "LOOPBACK",

		.num_elements = 32,

		.event_ring = 0,

		.dir = DMA_FROM_DEVICE,

		.ee_mask = 0x4,

		.pollcfg = 0,

		.doorbell = MHI_DB_BRST_DISABLE,

		.lpm_notify = false,

		.offload_channel = false,

		.doorbell_mode_switch = false,

		.auto_queue = false,

	},

static const struct mhi_channel_config ath11k_mhi_channels_qca6390[] = {

	{

		.num = 20,

		.name = "IPCR",
@@ -102,46 +74,18 @@ static struct mhi_event_config ath11k_mhi_events_qca6390[] = { 
	},

};



static struct mhi_controller_config ath11k_mhi_config_qca6390 = {

static const struct mhi_controller_config ath11k_mhi_config_qca6390 = {

	.max_channels = 128,

	.timeout_ms = 2000,

	.use_bounce_buf = false,

	.buf_len = 0,

	.buf_len = 8192,

	.num_channels = ARRAY_SIZE(ath11k_mhi_channels_qca6390),

	.ch_cfg = ath11k_mhi_channels_qca6390,

	.num_events = ARRAY_SIZE(ath11k_mhi_events_qca6390),

	.event_cfg = ath11k_mhi_events_qca6390,

};



static struct mhi_channel_config ath11k_mhi_channels_qcn9074[] = {

	{

		.num = 0,

		.name = "LOOPBACK",

		.num_elements = 32,

		.event_ring = 1,

		.dir = DMA_TO_DEVICE,

		.ee_mask = 0x14,

		.pollcfg = 0,

		.doorbell = MHI_DB_BRST_DISABLE,

		.lpm_notify = false,

		.offload_channel = false,

		.doorbell_mode_switch = false,

		.auto_queue = false,

	},

	{

		.num = 1,

		.name = "LOOPBACK",

		.num_elements = 32,

		.event_ring = 1,

		.dir = DMA_FROM_DEVICE,

		.ee_mask = 0x14,

		.pollcfg = 0,

		.doorbell = MHI_DB_BRST_DISABLE,

		.lpm_notify = false,

		.offload_channel = false,

		.doorbell_mode_switch = false,

		.auto_queue = false,

	},

static const struct mhi_channel_config ath11k_mhi_channels_qcn9074[] = {

	{

		.num = 20,

		.name = "IPCR",
@@ -195,7 +139,7 @@ static struct mhi_event_config ath11k_mhi_events_qcn9074[] = { 
	},

};



static struct mhi_controller_config ath11k_mhi_config_qcn9074 = {

static const struct mhi_controller_config ath11k_mhi_config_qcn9074 = {

	.max_channels = 30,

	.timeout_ms = 10000,

	.use_bounce_buf = false,
@@ -384,7 +328,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci) 
{

	struct ath11k_base *ab = ab_pci->ab;

	struct mhi_controller *mhi_ctrl;

	struct mhi_controller_config *ath11k_mhi_config;

	const struct mhi_controller_config *ath11k_mhi_config;

	int ret;



	mhi_ctrl = mhi_alloc_controller();