Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 418ca599 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath10k: Make target cpu address to CE address conversion chip specific 



Make the helper converting target virtual address space to CE address
space a target type specific to support QCA99X0. Also make this as
function instead of macro.

Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 050af069

drivers/net/wireless/ath/ath10k/pci.c

+22 −3
Original line number Diff line number Diff line
@@ -755,6 +755,26 @@ static void ath10k_pci_rx_replenish_retry(unsigned long ptr) 
	ath10k_pci_rx_post(ar);

}



static u32 ath10k_pci_targ_cpu_to_ce_addr(struct ath10k *ar, u32 addr)

{

	u32 val = 0;



	switch (ar->hw_rev) {

	case ATH10K_HW_QCA988X:

	case ATH10K_HW_QCA6174:

		val = (ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +

					  CORE_CTRL_ADDRESS) &

		       0x7fff) << 21;

		break;

	case ATH10K_HW_QCA99X0:

		val = ath10k_pci_read32(ar, PCIE_BAR_REG_ADDRESS);

		break;

	}



	val |= 0x100000 | (addr & 0xfffff);

	return val;

}



/*

 * Diagnostic read/write access is provided for startup/config/debug usage.

 * Caller must guarantee proper alignment, when applicable, and single user
@@ -817,8 +837,7 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data, 
		 * convert it from Target CPU virtual address space

		 * to CE address space

		 */

		address = TARG_CPU_SPACE_TO_CE_SPACE(ar, ar_pci->mem,

						     address);

		address = ath10k_pci_targ_cpu_to_ce_addr(ar, address);



		ret = ath10k_ce_send_nolock(ce_diag, NULL, (u32)address, nbytes, 0,

					    0);
@@ -976,7 +995,7 @@ static int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address, 
	 * to

	 *    CE address space

	 */

	address = TARG_CPU_SPACE_TO_CE_SPACE(ar, ar_pci->mem, address);

	address = ath10k_pci_targ_cpu_to_ce_addr(ar, address);



	remaining_bytes = orig_nbytes;

	ce_data = ce_data_base;

drivers/net/wireless/ath/ath10k/pci.h

+0 −12
Original line number Diff line number Diff line
@@ -237,18 +237,6 @@ static inline struct ath10k_pci *ath10k_pci_priv(struct ath10k *ar) 
#define CDC_WAR_MAGIC_STR   0xceef0000

#define CDC_WAR_DATA_CE     4



/*

 * TODO: Should be a function call specific to each Target-type.

 * This convoluted macro converts from Target CPU Virtual Address Space to CE

 * Address Space. As part of this process, we conservatively fetch the current

 * PCIE_BAR. MOST of the time, this should match the upper bits of PCI space

 * for this device; but that's not guaranteed.

 */

#define TARG_CPU_SPACE_TO_CE_SPACE(ar, pci_addr, addr)			\

	(((ath10k_pci_read32(ar, (SOC_CORE_BASE_ADDRESS |		\

	  CORE_CTRL_ADDRESS)) & 0x7ff) << 21) |				\

	 0x100000 | ((addr) & 0xfffff))



/* Wait up to this many Ms for a Diagnostic Access CE operation to complete */

#define DIAG_ACCESS_CE_TIMEOUT_MS 10