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

Commit 56398519 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Kalle Valo
Browse files

ath9k: simplify the code-paths when not using the built-in EEPROM 



There were two paths in the code for "external" eeprom sources. The code
in eeprom.c only handled the cases where the eeprom data was loaded via
request_firmware. ahb.c and pci.c on the other hand had some duplicate
code which was only used when the eeprom data was passed via
ath9k_platform_data.
With this change all eeprom data handling is now unified in eeprom.c.

Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 42e54152

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

+3 −15
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <linux/nl80211.h>

#include <linux/platform_device.h>

#include <linux/ath9k_platform.h>

#include <linux/module.h>

#include "ath9k.h"
@@ -58,22 +57,11 @@ static void ath_ahb_read_cachesize(struct ath_common *common, int *csz) 


static bool ath_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)

{

	struct ath_softc *sc = (struct ath_softc *)common->priv;

	struct platform_device *pdev = to_platform_device(sc->dev);

	struct ath9k_platform_data *pdata;



	pdata = dev_get_platdata(&pdev->dev);

	if (off >= (ARRAY_SIZE(pdata->eeprom_data))) {

		ath_err(common,

			"%s: flash read failed, offset %08x is out of range\n",

			__func__, off);

	ath_err(common, "%s: eeprom data has to be provided externally\n",

		__func__);

	return false;

}



	*data = pdata->eeprom_data[off];

	return true;

}



static struct ath_bus_ops ath_ahb_bus_ops  = {

	.ath_bus_type = ATH_AHB,

	.read_cachesize = ath_ahb_read_cachesize,

drivers/net/wireless/ath/ath9k/eeprom.c

+25 −8
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include "hw.h"

#include <linux/ath9k_platform.h>



void ath9k_hw_analog_shift_regwrite(struct ath_hw *ah, u32 reg, u32 val)

{
@@ -108,26 +109,42 @@ void ath9k_hw_usb_gen_fill_eeprom(struct ath_hw *ah, u16 *eep_data, 
	}

}



static bool ath9k_hw_nvram_read_blob(struct ath_hw *ah, u32 off,

				     u16 *data)

static bool ath9k_hw_nvram_read_array(u16 *blob, size_t blob_size,

				      off_t offset, u16 *data)

{

	u16 *blob_data;



	if (off * sizeof(u16) > ah->eeprom_blob->size)

	if (offset > blob_size)

		return false;



	blob_data = (u16 *)ah->eeprom_blob->data;

	*data =  blob_data[off];

	*data =  blob[offset];

	return true;

}



static bool ath9k_hw_nvram_read_pdata(struct ath9k_platform_data *pdata,

				      off_t offset, u16 *data)

{

	return ath9k_hw_nvram_read_array(pdata->eeprom_data,

					 ARRAY_SIZE(pdata->eeprom_data),

					 offset, data);

}



static bool ath9k_hw_nvram_read_firmware(const struct firmware *eeprom_blob,

					 off_t offset, u16 *data)

{

	return ath9k_hw_nvram_read_array((u16 *) eeprom_blob->data,

					 eeprom_blob->size / sizeof(u16),

					 offset, data);

}



bool ath9k_hw_nvram_read(struct ath_hw *ah, u32 off, u16 *data)

{

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath9k_platform_data *pdata = ah->dev->platform_data;

	bool ret;



	if (ah->eeprom_blob)

		ret = ath9k_hw_nvram_read_blob(ah, off, data);

		ret = ath9k_hw_nvram_read_firmware(ah->eeprom_blob, off, data);

	else if (pdata && !pdata->use_eeprom && pdata->eeprom_data)

		ret = ath9k_hw_nvram_read_pdata(pdata, off, data);

	else

		ret = common->bus_ops->eeprom_read(common, off, data);

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

+13 −30
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/nl80211.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/ath9k_platform.h>

#include <linux/module.h>

#include "ath9k.h"
@@ -786,24 +785,9 @@ static void ath_pci_read_cachesize(struct ath_common *common, int *csz) 


static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data)

{

	struct ath_softc *sc = (struct ath_softc *) common->priv;

	struct ath9k_platform_data *pdata = sc->dev->platform_data;



	if (pdata && !pdata->use_eeprom) {

		if (off >= (ARRAY_SIZE(pdata->eeprom_data))) {

			ath_err(common,

				"%s: eeprom read failed, offset %08x is out of range\n",

				__func__, off);



			return false;

		}



		*data = pdata->eeprom_data[off];

	} else {

	struct ath_hw *ah = (struct ath_hw *) common->ah;



		common->ops->read(ah, AR5416_EEPROM_OFFSET +

				      (off << AR5416_EEPROM_S));

	common->ops->read(ah, AR5416_EEPROM_OFFSET + (off << AR5416_EEPROM_S));



	if (!ath9k_hw_wait(ah,

				AR_EEPROM_STATUS_DATA,
@@ -815,7 +799,6 @@ static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data) 


	*data = MS(common->ops->read(ah, AR_EEPROM_STATUS_DATA),

			AR_EEPROM_STATUS_DATA_VAL);

	}



	return true;

}