ath11k: add hw_ops for pdev id to hw_mac mapping (d547ca4c) · Commits · 戴 / test

drivers/net/wireless/ath/ath11k/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@ ath11k-y += core.o \
		debug.o \
		ce.o \
		peer.o \
		dbring.o
		dbring.o \
		hw.o

		ath11k-$(CONFIG_ATH11K_DEBUGFS) += debug_htt_stats.o debugfs_sta.o
		ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o

+8 −7

Original line number	Diff line number	Diff line
		@@ -734,6 +734,7 @@ static irqreturn_t ath11k_ahb_ext_interrupt_handler(int irq, void *arg)

		static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab)
		{
		struct ath11k_hw_params *hw = &ab->hw_params;
		int i, j;
		int irq;
		int ret;
		@@ -768,26 +769,26 @@ static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab)
		if (ath11k_reo_status_ring_mask[i] & BIT(j))
		irq_grp->irqs[num_irq++] = reo2host_status;

		if (j < MAX_RADIOS) {
		if (j < ab->hw_params.max_radios) {
		if (ath11k_rxdma2host_ring_mask[i] & BIT(j)) {
		irq_grp->irqs[num_irq++] =
		rxdma2host_destination_ring_mac1
		- ath11k_core_get_hw_mac_id(ab, j);
		rxdma2host_destination_ring_mac1 -
		ath11k_hw_get_mac_from_pdev_id(hw, j);
		}

		if (ath11k_host2rxdma_ring_mask[i] & BIT(j)) {
		irq_grp->irqs[num_irq++] =
		host2rxdma_host_buf_ring_mac1
		- ath11k_core_get_hw_mac_id(ab, j);
		host2rxdma_host_buf_ring_mac1 -
		ath11k_hw_get_mac_from_pdev_id(hw, j);
		}

		if (rx_mon_status_ring_mask[i] & BIT(j)) {
		irq_grp->irqs[num_irq++] =
		ppdu_end_interrupts_mac1 -
		ath11k_core_get_hw_mac_id(ab, j);
		ath11k_hw_get_mac_from_pdev_id(hw, j);
		irq_grp->irqs[num_irq++] =
		rxdma2host_monitor_status_ring_mac1 -
		ath11k_core_get_hw_mac_id(ab, j);
		ath11k_hw_get_mac_from_pdev_id(hw, j);
		}
		}
		}

+1 −17

Original line number	Diff line number	Diff line
		@@ -27,26 +27,10 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
		.cal_size = IPQ8074_MAX_CAL_DATA_SZ,
		},
		.max_radios = 3,
		.hw_ops = &ipq8074_ops,
		},
		};

		/* Map from pdev index to hw mac index */
		u8 ath11k_core_get_hw_mac_id(struct ath11k_base *ab, int pdev_idx)
		{
		switch (pdev_idx) {
		case 0:
		return 0;
		case 1:
		return 2;
		case 2:
		return 1;
		default:
		ath11k_warn(ab, "Invalid pdev idx %d\n", pdev_idx);
		return ATH11K_INVALID_HW_MAC_ID;
		}
		}
		EXPORT_SYMBOL(ath11k_core_get_hw_mac_id);

		static int ath11k_core_create_board_name(struct ath11k_base ab, char name,
		size_t name_len)
		{

+0 −1

Original line number	Diff line number	Diff line
		@@ -860,7 +860,6 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ath11k,
		void ath11k_core_free_bdf(struct ath11k_base ab, struct ath11k_board_data bd);

		void ath11k_core_halt(struct ath11k *ar);
		u8 ath11k_core_get_hw_mac_id(struct ath11k_base *ab, int pdev_idx);

		static inline const char *ath11k_scan_state_str(enum ath11k_scan_state state)
		{

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: BSD-3-Clause-Clear
		/*
		* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
		*/

		#include "core.h"

		/* Map from pdev index to hw mac index */
		static u8 ath11k_hw_ipq8074_mac_from_pdev_id(int pdev_idx)
		{
		switch (pdev_idx) {
		case 0:
		return 0;
		case 1:
		return 2;
		case 2:
		return 1;
		default:
		return ATH11K_INVALID_HW_MAC_ID;
		}
		}

		static u8 ath11k_hw_ipq6018_mac_from_pdev_id(int pdev_idx)
		{
		return pdev_idx;
		}

		const struct ath11k_hw_ops ipq8074_ops = {
		.get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id,
		};

		const struct ath11k_hw_ops ipq6018_ops = {
		.get_hw_mac_from_pdev_id = ath11k_hw_ipq6018_mac_from_pdev_id,
		};