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

Commit 98929824 authored by Nishant Sarmukadam's avatar Nishant Sarmukadam Committed by John W. Linville
Browse files

mwl8k: Load 8764 firmware image 



This differs from legacy chips i.e.
a 8764 loads firmware image without a helper image
b Check interrupt status register for download
  complete indication.

Signed-off-by: default avatarNishant Sarmukadam <nishants@marvell.com>
Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d926dc7d

drivers/net/wireless/mwl8k.c

+19 −8
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ struct mwl8k_priv { 
	unsigned fw_state;

	char *fw_pref;

	char *fw_alt;

	bool is_8764;

	struct completion firmware_loading_complete;



	/* bitmap of running BSSes */
@@ -600,13 +601,18 @@ mwl8k_send_fw_load_cmd(struct mwl8k_priv *priv, void *data, int length) 
	loops = 1000;

	do {

		u32 int_code;



		if (priv->is_8764) {

			int_code = ioread32(regs +

					    MWL8K_HIU_H2A_INTERRUPT_STATUS);

			if (int_code == 0)

				break;

		} else {

			int_code = ioread32(regs + MWL8K_HIU_INT_CODE);

			if (int_code == MWL8K_INT_CODE_CMD_FINISHED) {

				iowrite32(0, regs + MWL8K_HIU_INT_CODE);

				break;

			}



		}

		cond_resched();

		udelay(1);

	} while (--loops);
@@ -724,7 +730,7 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw) 
	int rc;

	int loops;



	if (!memcmp(fw->data, "\x01\x00\x00\x00", 4)) {

	if (!memcmp(fw->data, "\x01\x00\x00\x00", 4) && !priv->is_8764) {

		const struct firmware *helper = priv->fw_helper;



		if (helper == NULL) {
@@ -743,6 +749,9 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw) 


		rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);

	} else {

		if (priv->is_8764)

			rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);

		else

			rc = mwl8k_load_fw_image(priv, fw->data, fw->size);

	}
@@ -6007,6 +6016,8 @@ static int mwl8k_probe(struct pci_dev *pdev, 
	priv->pdev = pdev;

	priv->device_info = &mwl8k_info_tbl[id->driver_data];



	if (id->driver_data == MWL8764)

		priv->is_8764 = true;



	priv->sram = pci_iomap(pdev, 0, 0x10000);

	if (priv->sram == NULL) {