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

Commit 641fe28a authored by Govind Singh's avatar Govind Singh Committed by Kalle Valo
Browse files

ath10k: make CE layer bus agnostic 



Remove bus specific dependencies from CE layer
to have common CE layer across multiple targets.
This is required for adding support for WCN3990
chipset support as WCN3990 chipset uses SNOC
bus interface with Copy Engine endpoint.

Signed-off-by: default avatarGovind Singh <govinds@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 5784f87d

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

+2 −1
Original line number Diff line number Diff line
@@ -787,8 +787,9 @@ static int ath10k_ahb_probe(struct platform_device *pdev) 
	ar_pci->mem = ar_ahb->mem;

	ar_pci->mem_len = ar_ahb->mem_len;

	ar_pci->ar = ar;

	ar_pci->bus_ops = &ath10k_ahb_bus_ops;

	ar_pci->ce.bus_ops = &ath10k_ahb_bus_ops;

	ar_pci->targ_cpu_to_ce_addr = ath10k_ahb_qca4019_targ_cpu_to_ce_addr;

	ar->ce_priv = &ar_pci->ce;



	ret = ath10k_pci_setup_resource(ar);

	if (ret) {

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

+164 −135

File changed.

Preview size limit exceeded, changes collapsed.

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

+26 −4
Original line number Diff line number Diff line
@@ -122,6 +122,24 @@ struct ath10k_ce_pipe { 
/* Copy Engine settable attributes */

struct ce_attr;



struct ath10k_bus_ops {

	u32 (*read32)(struct ath10k *ar, u32 offset);

	void (*write32)(struct ath10k *ar, u32 offset, u32 value);

	int (*get_num_banks)(struct ath10k *ar);

};



static inline struct ath10k_ce *ath10k_ce_priv(struct ath10k *ar)

{

	return (struct ath10k_ce *)ar->ce_priv;

}



struct ath10k_ce {

	/* protects CE info */

	spinlock_t ce_lock;

	const struct ath10k_bus_ops *bus_ops;

	struct ath10k_ce_pipe ce_states[CE_COUNT_MAX];

};



/*==================Send====================*/



/* ath10k_ce_send flags */
@@ -291,9 +309,13 @@ static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id) 
		CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB)

#define CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS			0x0000



#define CE_INTERRUPT_SUMMARY(ar) \

	CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_GET( \

		ath10k_pci_read32((ar), CE_WRAPPER_BASE_ADDRESS + \

		CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS))

static inline u32 ath10k_ce_interrupt_summary(struct ath10k *ar)

{

	struct ath10k_ce *ce = ath10k_ce_priv(ar);



	return CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_GET(

		ce->bus_ops->read32((ar), CE_WRAPPER_BASE_ADDRESS +

		CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS));

}



#endif /* _CE_H_ */

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

+2 −0
Original line number Diff line number Diff line
@@ -993,6 +993,8 @@ struct ath10k { 
		u32 reg_ack_cts_timeout_orig;

	} fw_coverage;



	void *ce_priv;



	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

};

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

+29 −22

File changed.

Preview size limit exceeded, changes collapsed.