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

Commit 88d15707 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

ath9k: introduce bus specific cache size routine 



The PCI specific bus_read_cachesize routine won't work on the AHB bus,
we have to replace it with a suitable one later.

Changes-licensed-under: ISC

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Tested-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7da3c55c

drivers/net/wireless/ath9k/core.h

+10 −0
Original line number Diff line number Diff line
@@ -693,6 +693,10 @@ enum PROT_MODE { 
#define SC_OP_RFKILL_SW_BLOCKED	BIT(12)

#define SC_OP_RFKILL_HW_BLOCKED	BIT(13)



struct ath_bus_ops {

	void		(*read_cachesize)(struct ath_softc *sc, int *csz);

};



struct ath_softc {

	struct ieee80211_hw *hw;

	struct device *dev;
@@ -743,6 +747,7 @@ struct ath_softc { 
#ifdef CONFIG_ATH9K_DEBUG

	struct ath9k_debug sc_debug;

#endif

	struct ath_bus_ops *bus_ops;

};



int ath_reset(struct ath_softc *sc, bool retry_tx);
@@ -750,4 +755,9 @@ int ath_get_hal_qnum(u16 queue, struct ath_softc *sc); 
int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc);

int ath_cabq_update(struct ath_softc *);



static inline void ath_read_cachesize(struct ath_softc *sc, int *csz)

{

	sc->bus_ops->read_cachesize(sc, csz);

}



#endif /* CORE_H */

drivers/net/wireless/ath9k/main.c

+7 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void ath_detach(struct ath_softc *sc); 


/* return bus cachesize in 4B word units */



static void bus_read_cachesize(struct ath_softc *sc, int *csz)

static void ath_pci_read_cachesize(struct ath_softc *sc, int *csz)

{

	u8 u8tmp;
@@ -1338,7 +1338,7 @@ static int ath_init(u16 devid, struct ath_softc *sc) 
	 * Cache line size is used to size and align various

	 * structures used to communicate with the hardware.

	 */

	bus_read_cachesize(sc, &csz);

	ath_read_cachesize(sc, &csz);

	/* XXX assert csz is non-zero */

	sc->sc_cachelsz = csz << 2;	/* convert to bytes */
@@ -2534,6 +2534,10 @@ ath_rf_name(u16 rf_version) 
	return "????";

}



static struct ath_bus_ops ath_pci_bus_ops = {

	.read_cachesize = ath_pci_read_cachesize,

};



static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	void __iomem *mem;
@@ -2622,6 +2626,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	sc->hw = hw;

	sc->dev = &pdev->dev;

	sc->mem = mem;

	sc->bus_ops = &ath_pci_bus_ops;



	if (ath_attach(id->device, sc) != 0) {

		ret = -ENODEV;