wil6210: firmware download (30f4520f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/wireless/ath/wil6210/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ wil6210-y += interrupt.o
		wil6210-y += txrx.o
		wil6210-y += debug.o
		wil6210-y += rx_reorder.o
		wil6210-y += fw.o
		wil6210-$(CONFIG_WIL6210_TRACING) += trace.o

		# for tracing framework to find trace.h

drivers/net/wireless/ath/wil6210/fw.c

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014 Qualcomm Atheros, Inc.
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		* copyright notice and this permission notice appear in all copies.
		*
		* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/
		#include <linux/firmware.h>
		#include <linux/module.h>
		#include <linux/pci.h>
		#include <linux/crc32.h>
		#include "wil6210.h"
		#include "fw.h"

		MODULE_FIRMWARE(WIL_FW_NAME);

		/* target operations */
		/* register read */
		#define R(a) ioread32(wil->csr + HOSTADDR(a))
		/* register write. wmb() to make sure it is completed */
		#define W(a, v) do { iowrite32(v, wil->csr + HOSTADDR(a)); wmb(); } while (0)
		/* register set = read, OR, write */
		#define S(a, v) W(a, R(a) \| v)
		/* register clear = read, AND with inverted, write */
		#define C(a, v) W(a, R(a) & ~v)

		static
		void wil_memset_toio_32(volatile void __iomem *dst, u32 val,
		size_t count)
		{
		volatile u32 __iomem *d = dst;

		for (count += 4; count > 4; count -= 4)
		__raw_writel(val, d++);
		}

		#include "fw_inc.c"

drivers/net/wireless/ath/wil6210/fw.h

0 → 100644

+149 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014 Qualcomm Atheros, Inc.
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		* copyright notice and this permission notice appear in all copies.
		*
		* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/

		#define WIL_FW_SIGNATURE (0x36323130) /* '0126' */
		#define WIL_FW_FMT_VERSION (1) /* format version driver supports */

		enum wil_fw_record_type {
		wil_fw_type_comment = 1,
		wil_fw_type_data = 2,
		wil_fw_type_fill = 3,
		wil_fw_type_action = 4,
		wil_fw_type_verify = 5,
		wil_fw_type_file_header = 6,
		wil_fw_type_direct_write = 7,
		wil_fw_type_gateway_data = 8,
		wil_fw_type_gateway_data4 = 9,
		};

		struct wil_fw_record_head {
		__le16 type; /* enum wil_fw_record_type */
		__le16 flags; /* to be defined */
		__le32 size; /* whole record, bytes after head */
		} __packed;

		/* data block. write starting from @addr
		* data_size inferred from the @head.size. For this case,
		* data_size = @head.size - offsetof(struct wil_fw_record_data, data)
		*/
		struct wil_fw_record_data { /* type == wil_fw_type_data */
		__le32 addr;
		__le32 data[0]; /* [data_size], see above */
		} __packed;

		/* fill with constant @value, @size bytes starting from @addr */
		struct wil_fw_record_fill { /* type == wil_fw_type_fill */
		__le32 addr;
		__le32 value;
		__le32 size;
		} __packed;

		/* free-form comment
		* for informational purpose, data_size is @head.size from record header
		*/
		struct wil_fw_record_comment { /* type == wil_fw_type_comment */
		u8 data[0]; /* free-form data [data_size], see above */
		} __packed;

		/* perform action
		* data_size = @head.size - offsetof(struct wil_fw_record_action, data)
		*/
		struct wil_fw_record_action { /* type == wil_fw_type_action */
		__le32 action; /* action to perform: reset, wait for fw ready etc. */
		__le32 data[0]; /* action specific, [data_size], see above */
		} __packed;

		/* data block for struct wil_fw_record_direct_write */
		struct wil_fw_data_dwrite {
		__le32 addr;
		__le32 value;
		__le32 mask;
		} __packed;

		/* write @value to the @addr,
		* preserve original bits accordingly to the @mask
		* data_size is @head.size where @head is record header
		*/
		struct wil_fw_record_direct_write { /* type == wil_fw_type_direct_write */
		struct wil_fw_data_dwrite data[0];
		} __packed;

		/* verify condition: [@addr] & @mask == @value
		* if condition not met, firmware download fails
		*/
		struct wil_fw_record_verify { /* type == wil_fw_verify */
		__le32 addr; /* read from this address */
		__le32 value; /* reference value */
		__le32 mask; /* mask for verification */
		} __packed;

		/* file header
		* First record of every file
		*/
		struct wil_fw_record_file_header {
		__le32 signature ; /* Wilocity signature */
		__le32 reserved;
		__le32 crc; /* crc32 of the following data */
		__le32 version; /* format version */
		__le32 data_len; /* total data in file, including this record */
		u8 comment[32]; /* short description */
		} __packed;

		/* 1-dword gateway */
		/* data block for the struct wil_fw_record_gateway_data */
		struct wil_fw_data_gw {
		__le32 addr;
		__le32 value;
		} __packed;

		/* gateway write block.
		* write starting address and values from the data buffer
		* through the gateway
		* data_size inferred from the @head.size. For this case,
		* data_size = @head.size - offsetof(struct wil_fw_record_gateway_data, data)
		*/
		struct wil_fw_record_gateway_data { /* type == wil_fw_type_gateway_data */
		__le32 gateway_addr_addr;
		__le32 gateway_value_addr;
		__le32 gateway_cmd_addr;
		__le32 gateway_ctrl_address;
		#define WIL_FW_GW_CTL_BUSY BIT(29) /* gateway busy performing operation */
		#define WIL_FW_GW_CTL_RUN BIT(30) /* start gateway operation */
		__le32 command;
		struct wil_fw_data_gw data[0]; /* total size [data_size], see above */
		} __packed;

		/* 4-dword gateway */
		/* data block for the struct wil_fw_record_gateway_data4 */
		struct wil_fw_data_gw4 {
		__le32 addr;
		__le32 value[4];
		} __packed;

		/* gateway write block.
		* write starting address and values from the data buffer
		* through the gateway
		* data_size inferred from the @head.size. For this case,
		* data_size = @head.size - offsetof(struct wil_fw_record_gateway_data4, data)
		*/
		struct wil_fw_record_gateway_data4 { /* type == wil_fw_type_gateway_data4 */
		__le32 gateway_addr_addr;
		__le32 gateway_value_addr[4];
		__le32 gateway_cmd_addr;
		__le32 gateway_ctrl_address; /* same logic as for 1-dword gw */
		__le32 command;
		struct wil_fw_data_gw4 data[0]; /* total size [data_size], see above */
		} __packed;

drivers/net/wireless/ath/wil6210/fw_inc.c

0 → 100644

+495 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014 Qualcomm Atheros, Inc.
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		* copyright notice and this permission notice appear in all copies.
		*
		* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/

		/* Algorithmic part of the firmware download.
		* To be included in the container file providing framework
		*/

		#define wil_err_fw(wil, fmt, arg...) wil_err(wil, "ERR[ FW ]" fmt, ##arg)
		#define wil_dbg_fw(wil, fmt, arg...) wil_dbg(wil, "DBG[ FW ]" fmt, ##arg)
		#define wil_hex_dump_fw(prefix_str, prefix_type, rowsize, \
		groupsize, buf, len, ascii) \
		print_hex_dump_debug("DBG[ FW ]" prefix_str, \
		prefix_type, rowsize, \
		groupsize, buf, len, ascii)

		#define FW_ADDR_CHECK(ioaddr, val, msg) do { \
		ioaddr = wmi_buffer(wil, val); \
		if (!ioaddr) { \
		wil_err_fw(wil, "bad " msg ": 0x%08x\n", \
		le32_to_cpu(val)); \
		return -EINVAL; \
		} \
		} while (0)

		/**
		* wil_fw_verify - verify firmware file validity
		*
		* perform various checks for the firmware file header.
		* records are not validated.
		*
		* Return file size or negative error
		*/
		static int wil_fw_verify(struct wil6210_priv wil, const u8 data, size_t size)
		{
		const struct wil_fw_record_head hdr = (const void )data;
		struct wil_fw_record_file_header fh;
		const struct wil_fw_record_file_header *fh_;
		u32 crc;
		u32 dlen;

		if (size % 4) {
		wil_err_fw(wil, "image size not aligned: %zu\n", size);
		return -EINVAL;
		}
		/* have enough data for the file header? */
		if (size < sizeof(*hdr) + sizeof(fh)) {
		wil_err_fw(wil, "file too short: %zu bytes\n", size);
		return -EINVAL;
		}

		/* start with the file header? */
		if (le16_to_cpu(hdr->type) != wil_fw_type_file_header) {
		wil_err_fw(wil, "no file header\n");
		return -EINVAL;
		}

		/* data_len */
		fh_ = (struct wil_fw_record_file_header *)&hdr[1];
		dlen = le32_to_cpu(fh_->data_len);
		if (dlen % 4) {
		wil_err_fw(wil, "data length not aligned: %lu\n", (ulong)dlen);
		return -EINVAL;
		}
		if (size < dlen) {
		wil_err_fw(wil, "file truncated at %zu/%lu\n",
		size, (ulong)dlen);
		return -EINVAL;
		}
		if (dlen < sizeof(*hdr) + sizeof(fh)) {
		wil_err_fw(wil, "data length too short: %lu\n", (ulong)dlen);
		return -EINVAL;
		}

		/* signature */
		if (le32_to_cpu(fh_->signature) != WIL_FW_SIGNATURE) {
		wil_err_fw(wil, "bad header signature: 0x%08x\n",
		le32_to_cpu(fh_->signature));
		return -EINVAL;
		}

		/* version */
		if (le32_to_cpu(fh_->version) > WIL_FW_FMT_VERSION) {
		wil_err_fw(wil, "unsupported header version: %d\n",
		le32_to_cpu(fh_->version));
		return -EINVAL;
		}

		/* checksum. ~crc32(~0, data, size) when fh.crc set to 0*/
		fh = *fh_;
		fh.crc = 0;

		crc = crc32_le(~0, (unsigned char const )hdr, sizeof(hdr));
		crc = crc32_le(crc, (unsigned char const *)&fh, sizeof(fh));
		crc = crc32_le(crc, (unsigned char const *)&fh_[1],
		dlen - sizeof(*hdr) - sizeof(fh));
		crc = ~crc;

		if (crc != le32_to_cpu(fh_->crc)) {
		wil_err_fw(wil, "checksum mismatch:"
		" calculated for %lu bytes 0x%08x != 0x%08x\n",
		(ulong)dlen, crc, le32_to_cpu(fh_->crc));
		return -EINVAL;
		}

		return (int)dlen;
		}

		static int fw_handle_comment(struct wil6210_priv wil, const void data,
		size_t size)
		{
		wil_hex_dump_fw("", DUMP_PREFIX_OFFSET, 16, 1, data, size, true);

		return 0;
		}

		static int fw_handle_data(struct wil6210_priv wil, const void data,
		size_t size)
		{
		const struct wil_fw_record_data *d = data;
		void __iomem *dst;
		size_t s = size - sizeof(*d);

		if (size < sizeof(*d) + sizeof(u32)) {
		wil_err_fw(wil, "data record too short: %zu\n", size);
		return -EINVAL;
		}

		FW_ADDR_CHECK(dst, d->addr, "address");
		wil_dbg_fw(wil, "write [0x%08x] <== %zu bytes\n", le32_to_cpu(d->addr),
		s);
		wil_memcpy_toio_32(dst, d->data, s);
		wmb(); /* finish before processing next record */

		return 0;
		}

		static int fw_handle_fill(struct wil6210_priv wil, const void data,
		size_t size)
		{
		const struct wil_fw_record_fill *d = data;
		void __iomem *dst;
		u32 v;
		size_t s = (size_t)le32_to_cpu(d->size);

		if (size != sizeof(*d)) {
		wil_err_fw(wil, "bad size for fill record: %zu\n", size);
		return -EINVAL;
		}

		if (s < sizeof(u32)) {
		wil_err_fw(wil, "fill size too short: %zu\n", s);
		return -EINVAL;
		}

		if (s % sizeof(u32)) {
		wil_err_fw(wil, "fill size not aligned: %zu\n", s);
		return -EINVAL;
		}

		FW_ADDR_CHECK(dst, d->addr, "address");

		v = le32_to_cpu(d->value);
		wil_dbg_fw(wil, "fill [0x%08x] <== 0x%08x, %zu bytes\n",
		le32_to_cpu(d->addr), v, s);
		wil_memset_toio_32(dst, v, s);
		wmb(); /* finish before processing next record */

		return 0;
		}

		static int fw_handle_file_header(struct wil6210_priv wil, const void data,
		size_t size)
		{
		const struct wil_fw_record_file_header *d = data;

		if (size != sizeof(*d)) {
		wil_err_fw(wil, "file header length incorrect: %zu\n", size);
		return -EINVAL;
		}

		wil_dbg_fw(wil, "new file, ver. %d, %i bytes\n",
		d->version, d->data_len);
		wil_hex_dump_fw("", DUMP_PREFIX_OFFSET, 16, 1, d->comment,
		sizeof(d->comment), true);

		return 0;
		}

		static int fw_handle_direct_write(struct wil6210_priv wil, const void data,
		size_t size)
		{
		const struct wil_fw_record_direct_write *d = data;
		const struct wil_fw_data_dwrite *block = d->data;
		int n, i;

		if (size % sizeof(*block)) {
		wil_err_fw(wil, "record size not aligned on %zu: %zu\n",
		sizeof(*block), size);
		return -EINVAL;
		}
		n = size / sizeof(*block);

		for (i = 0; i < n; i++) {
		void __iomem *dst;
		u32 m = le32_to_cpu(block[i].mask);
		u32 v = le32_to_cpu(block[i].value);
		u32 x, y;

		FW_ADDR_CHECK(dst, block[i].addr, "address");

		x = ioread32(dst);
		y = (x & m) \| (v & ~m);
		wil_dbg_fw(wil, "write [0x%08x] <== 0x%08x "
		"(old 0x%08x val 0x%08x mask 0x%08x)\n",
		le32_to_cpu(block[i].addr), y, x, v, m);
		iowrite32(y, dst);
		wmb(); /* finish before processing next record */
		}

		return 0;
		}

		static int gw_write(struct wil6210_priv wil, void __iomem gwa_addr,
		void __iomem gwa_cmd, void __iomem gwa_ctl, u32 gw_cmd,
		u32 a)
		{
		unsigned delay = 0;

		iowrite32(a, gwa_addr);
		iowrite32(gw_cmd, gwa_cmd);
		wmb(); /* finish before activate gw */

		iowrite32(WIL_FW_GW_CTL_RUN, gwa_ctl); /* activate gw */
		do {
		udelay(1); /* typical time is few usec */
		if (delay++ > 100) {
		wil_err_fw(wil, "gw timeout\n");
		return -EINVAL;
		}
		} while (ioread32(gwa_ctl) & WIL_FW_GW_CTL_BUSY); /* gw done? */

		return 0;
		}

		static int fw_handle_gateway_data(struct wil6210_priv wil, const void data,
		size_t size)
		{
		const struct wil_fw_record_gateway_data *d = data;
		const struct wil_fw_data_gw *block = d->data;
		void __iomem *gwa_addr;
		void __iomem *gwa_val;
		void __iomem *gwa_cmd;
		void __iomem *gwa_ctl;
		u32 gw_cmd;
		int n, i;

		if (size < sizeof(d) + sizeof(block)) {
		wil_err_fw(wil, "gateway record too short: %zu\n", size);
		return -EINVAL;
		}

		if ((size - sizeof(d)) % sizeof(block)) {
		wil_err_fw(wil, "gateway record data size"
		" not aligned on %zu: %zu\n",
		sizeof(block), size - sizeof(d));
		return -EINVAL;
		}
		n = (size - sizeof(d)) / sizeof(block);

		gw_cmd = le32_to_cpu(d->command);

		wil_dbg_fw(wil, "gw write record [%3d] blocks, cmd 0x%08x\n",
		n, gw_cmd);

		FW_ADDR_CHECK(gwa_addr, d->gateway_addr_addr, "gateway_addr_addr");
		FW_ADDR_CHECK(gwa_val, d->gateway_value_addr, "gateway_value_addr");
		FW_ADDR_CHECK(gwa_cmd, d->gateway_cmd_addr, "gateway_cmd_addr");
		FW_ADDR_CHECK(gwa_ctl, d->gateway_ctrl_address, "gateway_ctrl_address");

		wil_dbg_fw(wil, "gw addresses: addr 0x%08x val 0x%08x"
		" cmd 0x%08x ctl 0x%08x\n",
		le32_to_cpu(d->gateway_addr_addr),
		le32_to_cpu(d->gateway_value_addr),
		le32_to_cpu(d->gateway_cmd_addr),
		le32_to_cpu(d->gateway_ctrl_address));

		for (i = 0; i < n; i++) {
		int rc;
		u32 a = le32_to_cpu(block[i].addr);
		u32 v = le32_to_cpu(block[i].value);

		wil_dbg_fw(wil, " gw write[%3d] [0x%08x] <== 0x%08x\n",
		i, a, v);

		iowrite32(v, gwa_val);
		rc = gw_write(wil, gwa_addr, gwa_cmd, gwa_ctl, gw_cmd, a);
		if (rc)
		return rc;
		}

		return 0;
		}

		static int fw_handle_gateway_data4(struct wil6210_priv wil, const void data,
		size_t size)
		{
		const struct wil_fw_record_gateway_data4 *d = data;
		const struct wil_fw_data_gw4 *block = d->data;
		void __iomem *gwa_addr;
		void __iomem *gwa_val[ARRAY_SIZE(block->value)];
		void __iomem *gwa_cmd;
		void __iomem *gwa_ctl;
		u32 gw_cmd;
		int n, i, k;

		if (size < sizeof(d) + sizeof(block)) {
		wil_err_fw(wil, "gateway4 record too short: %zu\n", size);
		return -EINVAL;
		}

		if ((size - sizeof(d)) % sizeof(block)) {
		wil_err_fw(wil, "gateway4 record data size"
		" not aligned on %zu: %zu\n",
		sizeof(block), size - sizeof(d));
		return -EINVAL;
		}
		n = (size - sizeof(d)) / sizeof(block);

		gw_cmd = le32_to_cpu(d->command);

		wil_dbg_fw(wil, "gw4 write record [%3d] blocks, cmd 0x%08x\n",
		n, gw_cmd);

		FW_ADDR_CHECK(gwa_addr, d->gateway_addr_addr, "gateway_addr_addr");
		for (k = 0; k < ARRAY_SIZE(block->value); k++)
		FW_ADDR_CHECK(gwa_val[k], d->gateway_value_addr[k],
		"gateway_value_addr");
		FW_ADDR_CHECK(gwa_cmd, d->gateway_cmd_addr, "gateway_cmd_addr");
		FW_ADDR_CHECK(gwa_ctl, d->gateway_ctrl_address, "gateway_ctrl_address");

		wil_dbg_fw(wil, "gw4 addresses: addr 0x%08x cmd 0x%08x ctl 0x%08x\n",
		le32_to_cpu(d->gateway_addr_addr),
		le32_to_cpu(d->gateway_cmd_addr),
		le32_to_cpu(d->gateway_ctrl_address));
		wil_hex_dump_fw("val addresses: ", DUMP_PREFIX_NONE, 16, 4,
		d->gateway_value_addr, sizeof(d->gateway_value_addr),
		false);

		for (i = 0; i < n; i++) {
		int rc;
		u32 a = le32_to_cpu(block[i].addr);
		u32 v[ARRAY_SIZE(block->value)];

		for (k = 0; k < ARRAY_SIZE(block->value); k++)
		v[k] = le32_to_cpu(block[i].value[k]);

		wil_dbg_fw(wil, " gw4 write[%3d] [0x%08x] <==\n", i, a);
		wil_hex_dump_fw(" val ", DUMP_PREFIX_NONE, 16, 4, v,
		sizeof(v), false);

		for (k = 0; k < ARRAY_SIZE(block->value); k++)
		iowrite32(v[k], gwa_val[k]);
		rc = gw_write(wil, gwa_addr, gwa_cmd, gwa_ctl, gw_cmd, a);
		if (rc)
		return rc;
		}

		return 0;
		}

		static const struct {
		int type;
		int (handler)(struct wil6210_priv wil, const void *data, size_t size);
		} wil_fw_handlers[] = {
		{wil_fw_type_comment, fw_handle_comment},
		{wil_fw_type_data, fw_handle_data},
		{wil_fw_type_fill, fw_handle_fill},
		/* wil_fw_type_action */
		/* wil_fw_type_verify */
		{wil_fw_type_file_header, fw_handle_file_header},
		{wil_fw_type_direct_write, fw_handle_direct_write},
		{wil_fw_type_gateway_data, fw_handle_gateway_data},
		{wil_fw_type_gateway_data4, fw_handle_gateway_data4},
		};

		static int wil_fw_handle_record(struct wil6210_priv *wil, int type,
		const void *data, size_t size)
		{
		int i;

		for (i = 0; i < ARRAY_SIZE(wil_fw_handlers); i++) {
		if (wil_fw_handlers[i].type == type)
		return wil_fw_handlers[i].handler(wil, data, size);
		}

		wil_err_fw(wil, "unknown record type: %d\n", type);
		return -EINVAL;
		}

		/**
		* wil_fw_load - load FW into device
		*
		* Load the FW and uCode code and data to the corresponding device
		* memory regions
		*
		* Return error code
		*/
		static int wil_fw_load(struct wil6210_priv wil, const void data, size_t size)
		{
		int rc = 0;
		const struct wil_fw_record_head *hdr;
		size_t s, hdr_sz;

		for (hdr = data;; hdr = (const void *)hdr + s, size -= s) {
		if (size < sizeof(*hdr))
		break;
		hdr_sz = le32_to_cpu(hdr->size);
		s = sizeof(*hdr) + hdr_sz;
		if (s > size)
		break;
		if (hdr_sz % 4) {
		wil_err_fw(wil, "unaligned record size: %zu\n",
		hdr_sz);
		return -EINVAL;
		}
		rc = wil_fw_handle_record(wil, le16_to_cpu(hdr->type),
		&hdr[1], hdr_sz);
		if (rc)
		return rc;
		}
		if (size) {
		wil_err_fw(wil, "unprocessed bytes: %zu\n", size);
		if (size >= sizeof(*hdr)) {
		wil_err_fw(wil, "Stop at offset %ld"
		" record type %d [%zd bytes]\n",
		(const void *)hdr - data,
		le16_to_cpu(hdr->type), hdr_sz);
		}
		return -EINVAL;
		}
		/* Mark FW as loaded from host */
		S(RGF_USER_USAGE_6, 1);

		return rc;
		}

		/**
		* wil_request_firmware - Request firmware and load to device
		*
		* Request firmware image from the file and load it to device
		*
		* Return error code
		*/
		int wil_request_firmware(struct wil6210_priv wil, const char name)
		{
		int rc, rc1;
		const struct firmware *fw;
		size_t sz;
		const void *d;

		rc = request_firmware(&fw, name, wil_to_pcie_dev(wil));
		if (rc) {
		wil_err_fw(wil, "Failed to load firmware %s\n", name);
		return rc;
		}
		wil_dbg_fw(wil, "Loading <%s>, %zu bytes\n", name, fw->size);

		for (sz = fw->size, d = fw->data; sz; sz -= rc1, d += rc1) {
		rc1 = wil_fw_verify(wil, d, sz);
		if (rc1 < 0) {
		rc = rc1;
		goto out;
		}
		rc = wil_fw_load(wil, d, rc1);
		if (rc < 0)
		goto out;
		}

		out:
		release_firmware(fw);
		return rc;
		}

drivers/net/wireless/ath/wil6210/interrupt.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -522,6 +522,7 @@ void wil6210_clear_irq(struct wil6210_priv *wil)
		offsetof(struct RGF_ICR, ICR));
		wil_clear32(wil->csr + HOSTADDR(RGF_DMA_EP_MISC_ICR) +
		offsetof(struct RGF_ICR, ICR));
		wmb(); /* make sure write completed */
		}

		int wil6210_init_irq(struct wil6210_priv *wil, int irq)