Changes in 4.9.337 mm/khugepaged: fix GUP-fast interaction by sending IPI mm/khugepaged: invoke MMU notifiers in shmem/file collapse paths block: unhash blkdev part inode when the part is deleted ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() can: sja1000: fix size of OCR_MODE_MASK define ASoC: ops: Correct bounds check for second channel on SX controls udf: Discard preallocation before extending file with a hole udf: Drop unused arguments of udf_delete_aext() udf: Fix preallocation discarding at indirect extent boundary udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size udf: Fix extending file within last block usb: gadget: uvc: Prevent buffer overflow in setup handler USB: serial: cp210x: add Kamstrup RF sniffer PIDs Bluetooth: L2CAP: Fix u8 overflow net: loopback: use NET_NAME_PREDICTABLE for name_assign_type drivers: soc: ti: knav_qmss_queue: Mark knav_acc_firmwares as static arm: dts: spear600: Fix clcd interrupt soc: ti: smartreflex: Fix PM disable depth imbalance in omap_sr_probe ARM: dts: dove: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-370: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-xp: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-375: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-38x: Fix assigned-addresses for every PCIe Root Port ARM: dts: armada-39x: Fix assigned-addresses for every PCIe Root Port ARM: mmp: fix timer_read delay pstore: Avoid kcore oops by vmap()ing with VM_IOREMAP cpuidle: dt: Return the correct numbers of parsed idle states alpha: fix syscall entry in !AUDUT_SYSCALL case PM: hibernate: Fix mistake in kerneldoc comment fs: don't audit the capability check in simple_xattr_list() perf: Fix possible memleak in pmu_dev_alloc() timerqueue: Use rb_entry_safe() in timerqueue_getnext() ocfs2: fix memory leak in ocfs2_stack_glue_init() MIPS: vpe-mt: fix possible memory leak while module exiting MIPS: vpe-cmp: fix possible memory leak while module exiting PNP: fix name memory leak in pnp_alloc_dev() irqchip: gic-pm: Use pm_runtime_resume_and_get() in gic_probe() libfs: add DEFINE_SIMPLE_ATTRIBUTE_SIGNED for signed value lib/notifier-error-inject: fix error when writing -errno to debugfs file rapidio: fix possible name leaks when rio_add_device() fails rapidio: rio: fix possible name leak in rio_register_mport() ACPICA: Fix use-after-free in acpi_ut_copy_ipackage_to_ipackage() uprobes/x86: Allow to probe a NOP instruction with 0x66 prefix x86/xen: Fix memory leak in xen_init_lock_cpu() MIPS: BCM63xx: Add check for NULL for clk in clk_enable fs: sysv: Fix sysv_nblocks() returns wrong value rapidio: fix possible UAF when kfifo_alloc() fails eventfd: change int to __u64 in eventfd_signal() ifndef CONFIG_EVENTFD hfs: Fix OOB Write in hfs_asc2mac rapidio: devices: fix missing put_device in mport_cdev_open wifi: ath9k: hif_usb: fix memory leak of urbs in ath9k_hif_usb_dealloc_tx_urbs() wifi: ath9k: hif_usb: Fix use-after-free in ath9k_hif_usb_reg_in_cb() media: i2c: ad5820: Fix error path media: vivid: fix compose size exceed boundary mtd: Fix device name leak when register device failed in add_mtd_device() ASoC: pxa: fix null-pointer dereference in filter() regulator: core: fix unbalanced of node refcount in regulator_dev_lookup() ima: Fix misuse of dereference of pointer in template_desc_init_fields() wifi: ath10k: Fix return value in ath10k_pci_init() mtd: lpddr2_nvm: Fix possible null-ptr-deref Input: elants_i2c - properly handle the reset GPIO when power is off media: solo6x10: fix possible memory leak in solo_sysfs_init() media: platform: exynos4-is: Fix error handling in fimc_md_init() HID: hid-sensor-custom: set fixed size for custom attributes ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT clk: rockchip: Fix memory leak in rockchip_clk_register_pll() mtd: maps: pxa2xx-flash: fix memory leak in probe media: imon: fix a race condition in send_packet() pinctrl: pinconf-generic: add missing of_node_put() media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer() NFSv4.2: Fix a memory stomp in decode_attr_security_label NFSv4: Fix a deadlock between nfs4_open_recover_helper() and delegreturn ALSA: asihpi: fix missing pci_disable_device() drm/radeon: Fix PCI device refcount leak in radeon_atrm_get_bios() drm/amdgpu: Fix PCI device refcount leak in amdgpu_atrm_get_bios() ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe bonding: uninitialized variable in bond_miimon_inspect() regulator: core: fix module refcount leak in set_supply() media: saa7164: fix missing pci_disable_device() ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt SUNRPC: Fix missing release socket in rpc_sockname() mmc: moxart: fix return value check of mmc_add_host() mmc: mxcmmc: fix return value check of mmc_add_host() mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host() mmc: toshsd: fix return value check of mmc_add_host() mmc: vub300: fix return value check of mmc_add_host() mmc: via-sdmmc: fix return value check of mmc_add_host() mmc: wbsd: fix return value check of mmc_add_host() mmc: mmci: fix return value check of mmc_add_host() media: c8sectpfe: Add of_node_put() when breaking out of loop media: coda: Add check for dcoda_iram_alloc media: coda: Add check for kmalloc wifi: rtl8xxxu: Add __packed to struct rtl8723bu_c2h wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware() blktrace: Fix output non-blktrace event when blk_classic option enabled net: vmw_vsock: vmci: Check memcpy_from_msg() net: defxx: Fix missing err handling in dfx_init() drivers: net: qlcnic: Fix potential memory leak in qlcnic_sriov_init() ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave() net: farsync: Fix kmemleak when rmmods farsync net/tunnel: wait until all sk_user_data reader finish before releasing the sock net: apple: mace: don't call dev_kfree_skb() under spin_lock_irqsave() net: apple: bmac: don't call dev_kfree_skb() under spin_lock_irqsave() net: emaclite: don't call dev_kfree_skb() under spin_lock_irqsave() net: ethernet: dnet: don't call dev_kfree_skb() under spin_lock_irqsave() hamradio: don't call dev_kfree_skb() under spin_lock_irqsave() net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave() ntb_netdev: Use dev_kfree_skb_any() in interrupt context Bluetooth: btusb: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_qca: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_h5: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_bcsp: don't call kfree_skb() under spin_lock_irqsave() Bluetooth: hci_core: don't call kfree_skb() under spin_lock_irqsave() stmmac: fix potential division by 0 scsi: hpsa: Fix error handling in hpsa_add_sas_host() scsi: hpsa: Fix possible memory leak in hpsa_add_sas_device() scsi: fcoe: Fix possible name leak when device_register() fails scsi: ipr: Fix WARNING in ipr_init() scsi: fcoe: Fix transport not deattached when fcoe_if_init() fails scsi: snic: Fix possible UAF in snic_tgt_create() orangefs: Fix sysfs not cleanup when dev init failed crypto: img-hash - Fix variable dereferenced before check 'hdev->req' hwrng: amd - Fix PCI device refcount leak hwrng: geode - Fix PCI device refcount leak IB/IPoIB: Fix queue count inconsistency for PKEY child interfaces drivers: dio: fix possible memory leak in dio_init() vfio: platform: Do not pass return buffer to ACPI _RST method uio: uio_dmem_genirq: Fix missing unlock in irq configuration uio: uio_dmem_genirq: Fix deadlock between irq config and handling usb: fotg210-udc: Fix ages old endianness issues staging: vme_user: Fix possible UAF in tsi148_dma_list_add serial: amba-pl011: avoid SBSA UART accessing DMACR register serial: pch: Fix PCI device refcount leak in pch_request_dma() serial: sunsab: Fix error handling in sunsab_init() misc: tifm: fix possible memory leak in tifm_7xx1_switch_media() misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os cxl: fix possible null-ptr-deref in cxl_guest_init_afu|adapter() cxl: fix possible null-ptr-deref in cxl_pci_init_afu|adapter() drivers: mcb: fix resource leak in mcb_probe() mcb: mcb-parse: fix error handing in chameleon_parse_gdd() chardev: fix error handling in cdev_device_add() i2c: pxa-pci: fix missing pci_disable_device() on error in ce4100_i2c_probe staging: rtl8192u: Fix use after free in ieee80211_rx() staging: rtl8192e: Fix potential use-after-free in rtllib_rx_Monitor() vme: Fix error not catched in fake_init() i2c: ismt: Fix an out-of-bounds bug in ismt_access() usb: storage: Add check for kcalloc fbdev: ssd1307fb: Drop optional dependency fbdev: pm2fb: fix missing pci_disable_device() fbdev: via: Fix error in via_core_init() fbdev: vermilion: decrease reference count in error path fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() HSI: omap_ssi_core: fix unbalanced pm_runtime_disable() HSI: omap_ssi_core: fix possible memory leak in ssi_probe() power: supply: fix residue sysfs file in error handle route of __power_supply_register() HSI: omap_ssi_core: Fix error handling in ssi_init() include/uapi/linux/swab: Fix potentially missing __always_inline rtc: snvs: Allow a time difference on clock register read iommu/fsl_pamu: Fix resource leak in fsl_pamu_probe() macintosh: fix possible memory leak in macio_add_one_device() macintosh/macio-adb: check the return value of ioremap() powerpc/52xx: Fix a resource leak in an error handling path powerpc/perf: callchain validate kernel stack pointer bounds powerpc/83xx/mpc832x_rdb: call platform_device_put() in error case in of_fsl_spi_probe() powerpc/hv-gpci: Fix hv_gpci event list selftests/powerpc: Fix resource leaks rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe() nfsd: under NFSv4.1, fix double svc_xprt_put on rpc_create failure mISDN: hfcsusb: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() mISDN: hfcpci: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() mISDN: hfcmulti: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() nfc: pn533: Clear nfc_target before being used r6040: Fix kmemleak in probe and remove openvswitch: Fix flow lookup to use unmasked key skbuff: Account for tail adjustment during pull operations net_sched: reject TCF_EM_SIMPLE case for complex ematch module myri10ge: Fix an error handling path in myri10ge_probe() net: stream: purge sk_error_queue in sk_stream_kill_queues() binfmt_misc: fix shift-out-of-bounds in check_special_flags fs: jfs: fix shift-out-of-bounds in dbAllocAG udf: Avoid double brelse() in udf_rename() fs: jfs: fix shift-out-of-bounds in dbDiscardAG ACPICA: Fix error code path in acpi_ds_call_control_method() nilfs2: fix shift-out-of-bounds/overflow in nilfs_sb2_bad_offset() acct: fix potential integer overflow in encode_comp_t() hfs: fix OOB Read in __hfs_brec_find wifi: ath9k: verify the expected usb_endpoints are present wifi: ar5523: Fix use-after-free on ar5523_cmd() timed out ipmi: fix memleak when unload ipmi driver net: ethernet: ti: Fix return type of netcp_ndo_start_xmit() hamradio: baycom_epp: Fix return type of baycom_send_packet() wifi: brcmfmac: Fix potential shift-out-of-bounds in brcmf_fw_alloc_request() igb: Do not free q_vector unless new one was allocated s390/ctcm: Fix return type of ctc{mp,}m_tx() s390/netiucv: Fix return type of netiucv_tx() s390/lcs: Fix return type of lcs_start_xmit() drm/sti: Use drm_mode_copy() md/raid1: stop mdx_raid1 thread when raid1 array run failed mrp: introduce active flags to prevent UAF when applicant uninit ppp: associate skb with a device at tx media: dvb-frontends: fix leak of memory fw media: dvb-usb: fix memory leak in dvb_usb_adapter_init() blk-mq: fix possible memleak when register 'hctx' failed mmc: f-sdh30: Add quirks for broken timeout clock capability media: si470x: Fix use-after-free in si470x_int_in_callback() clk: st: Fix memory leak in st_of_quadfs_setup() drm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid() drm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_mode_valid() orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string() ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe() ASoC: wm8994: Fix potential deadlock ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume() ASoC: rt5670: Remove unbalanced pm_runtime_put() HID: wacom: Ensure bootloader PID is usable in hidraw mode reiserfs: Add missing calls to reiserfs_security_free() iio: adc: ad_sigma_delta: do not use internal iio_dev lock gcov: add support for checksum field powerpc/rtas: avoid scheduling in rtas_os_term() HID: plantronics: Additional PIDs for double volume key presses quirk hfsplus: fix bug causing custom uid and gid being unable to be assigned with mount ALSA: line6: correct midi status byte when receiving data from podxt ALSA: line6: fix stack overflow in line6_midi_transmit pnode: terminate at peers of source md: fix a crash in mempool_free mmc: vub300: fix warning - do not call blocking ops when !TASK_RUNNING media: stv0288: use explicitly signed char ktest.pl minconfig: Unset configs instead of just removing them ARM: ux500: do not directly dereference __iomem dm cache: Fix ABBA deadlock between shrink_slab and dm_cache_metadata_abort dm thin: Use last transaction's pmd->root when commit failed dm thin: Fix UAF in run_timer_softirq() dm cache: Fix UAF in destroy() dm cache: set needs_check flag after aborting metadata tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line ARM: 9256/1: NWFPE: avoid compiler-generated __aeabi_uldivmod media: dvb-core: Fix double free in dvb_register_device() cifs: fix confusing debug message PCI/sysfs: Fix double free in error path crypto: n2 - add missing hash statesize iommu/amd: Fix ivrs_acpihid cmdline parsing code parisc: led: Fix potential null-ptr-deref in start_task() device_cgroup: Roll back to original exceptions after copy failure drm/connector: send hotplug uevent on connector cleanup drm/vmwgfx: Validate the box size for the snooped cursor ext4: add inode table check in __ext4_get_inode_loc to aovid possible infinite loop ext4: fix undefined behavior in bit shift for ext4_check_flag_values ext4: fix bug_on in __es_tree_search caused by bad boot loader inode ext4: init quota for 'old.inode' in 'ext4_rename' ext4: fix error code return to user-space in ext4_get_branch() ext4: avoid BUG_ON when creating xattrs ext4: initialize quota before expanding inode in setproject ioctl Linux 4.9.337 Change-Id: I923e3fef499ae1688b25c70a1a805b55a9f4f027 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
614 lines
15 KiB
C
614 lines
15 KiB
C
/*
|
|
* Copyright (c) 2013 Broadcom Corporation
|
|
*
|
|
* 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/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/device.h>
|
|
#include <linux/firmware.h>
|
|
#include <linux/module.h>
|
|
#include <linux/bcm47xx_nvram.h>
|
|
|
|
#include "debug.h"
|
|
#include "firmware.h"
|
|
#include "core.h"
|
|
#include "common.h"
|
|
|
|
#define BRCMF_FW_MAX_NVRAM_SIZE 64000
|
|
#define BRCMF_FW_NVRAM_DEVPATH_LEN 19 /* devpath0=pcie/1/4/ */
|
|
#define BRCMF_FW_NVRAM_PCIEDEV_LEN 10 /* pcie/1/4/ + \0 */
|
|
#define BRCMF_FW_DEFAULT_BOARDREV "boardrev=0xff"
|
|
|
|
enum nvram_parser_state {
|
|
IDLE,
|
|
KEY,
|
|
VALUE,
|
|
COMMENT,
|
|
END
|
|
};
|
|
|
|
/**
|
|
* struct nvram_parser - internal info for parser.
|
|
*
|
|
* @state: current parser state.
|
|
* @data: input buffer being parsed.
|
|
* @nvram: output buffer with parse result.
|
|
* @nvram_len: lenght of parse result.
|
|
* @line: current line.
|
|
* @column: current column in line.
|
|
* @pos: byte offset in input buffer.
|
|
* @entry: start position of key,value entry.
|
|
* @multi_dev_v1: detect pcie multi device v1 (compressed).
|
|
* @multi_dev_v2: detect pcie multi device v2.
|
|
* @boardrev_found: nvram contains boardrev information.
|
|
*/
|
|
struct nvram_parser {
|
|
enum nvram_parser_state state;
|
|
const u8 *data;
|
|
u8 *nvram;
|
|
u32 nvram_len;
|
|
u32 line;
|
|
u32 column;
|
|
u32 pos;
|
|
u32 entry;
|
|
bool multi_dev_v1;
|
|
bool multi_dev_v2;
|
|
bool boardrev_found;
|
|
};
|
|
|
|
/**
|
|
* is_nvram_char() - check if char is a valid one for NVRAM entry
|
|
*
|
|
* It accepts all printable ASCII chars except for '#' which opens a comment.
|
|
* Please note that ' ' (space) while accepted is not a valid key name char.
|
|
*/
|
|
static bool is_nvram_char(char c)
|
|
{
|
|
/* comment marker excluded */
|
|
if (c == '#')
|
|
return false;
|
|
|
|
/* key and value may have any other readable character */
|
|
return (c >= 0x20 && c < 0x7f);
|
|
}
|
|
|
|
static bool is_whitespace(char c)
|
|
{
|
|
return (c == ' ' || c == '\r' || c == '\n' || c == '\t');
|
|
}
|
|
|
|
static enum nvram_parser_state brcmf_nvram_handle_idle(struct nvram_parser *nvp)
|
|
{
|
|
char c;
|
|
|
|
c = nvp->data[nvp->pos];
|
|
if (c == '\n')
|
|
return COMMENT;
|
|
if (is_whitespace(c) || c == '\0')
|
|
goto proceed;
|
|
if (c == '#')
|
|
return COMMENT;
|
|
if (is_nvram_char(c)) {
|
|
nvp->entry = nvp->pos;
|
|
return KEY;
|
|
}
|
|
brcmf_dbg(INFO, "warning: ln=%d:col=%d: ignoring invalid character\n",
|
|
nvp->line, nvp->column);
|
|
proceed:
|
|
nvp->column++;
|
|
nvp->pos++;
|
|
return IDLE;
|
|
}
|
|
|
|
static enum nvram_parser_state brcmf_nvram_handle_key(struct nvram_parser *nvp)
|
|
{
|
|
enum nvram_parser_state st = nvp->state;
|
|
char c;
|
|
|
|
c = nvp->data[nvp->pos];
|
|
if (c == '=') {
|
|
/* ignore RAW1 by treating as comment */
|
|
if (strncmp(&nvp->data[nvp->entry], "RAW1", 4) == 0)
|
|
st = COMMENT;
|
|
else
|
|
st = VALUE;
|
|
if (strncmp(&nvp->data[nvp->entry], "devpath", 7) == 0)
|
|
nvp->multi_dev_v1 = true;
|
|
if (strncmp(&nvp->data[nvp->entry], "pcie/", 5) == 0)
|
|
nvp->multi_dev_v2 = true;
|
|
if (strncmp(&nvp->data[nvp->entry], "boardrev", 8) == 0)
|
|
nvp->boardrev_found = true;
|
|
} else if (!is_nvram_char(c) || c == ' ') {
|
|
brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n",
|
|
nvp->line, nvp->column);
|
|
return COMMENT;
|
|
}
|
|
|
|
nvp->column++;
|
|
nvp->pos++;
|
|
return st;
|
|
}
|
|
|
|
static enum nvram_parser_state
|
|
brcmf_nvram_handle_value(struct nvram_parser *nvp)
|
|
{
|
|
char c;
|
|
char *skv;
|
|
char *ekv;
|
|
u32 cplen;
|
|
|
|
c = nvp->data[nvp->pos];
|
|
if (!is_nvram_char(c)) {
|
|
/* key,value pair complete */
|
|
ekv = (u8 *)&nvp->data[nvp->pos];
|
|
skv = (u8 *)&nvp->data[nvp->entry];
|
|
cplen = ekv - skv;
|
|
if (nvp->nvram_len + cplen + 1 >= BRCMF_FW_MAX_NVRAM_SIZE)
|
|
return END;
|
|
/* copy to output buffer */
|
|
memcpy(&nvp->nvram[nvp->nvram_len], skv, cplen);
|
|
nvp->nvram_len += cplen;
|
|
nvp->nvram[nvp->nvram_len] = '\0';
|
|
nvp->nvram_len++;
|
|
return IDLE;
|
|
}
|
|
nvp->pos++;
|
|
nvp->column++;
|
|
return VALUE;
|
|
}
|
|
|
|
static enum nvram_parser_state
|
|
brcmf_nvram_handle_comment(struct nvram_parser *nvp)
|
|
{
|
|
char *eoc, *sol;
|
|
|
|
sol = (char *)&nvp->data[nvp->pos];
|
|
eoc = strchr(sol, '\n');
|
|
if (!eoc) {
|
|
eoc = strchr(sol, '\0');
|
|
if (!eoc)
|
|
return END;
|
|
}
|
|
|
|
/* eat all moving to next line */
|
|
nvp->line++;
|
|
nvp->column = 1;
|
|
nvp->pos += (eoc - sol) + 1;
|
|
return IDLE;
|
|
}
|
|
|
|
static enum nvram_parser_state brcmf_nvram_handle_end(struct nvram_parser *nvp)
|
|
{
|
|
/* final state */
|
|
return END;
|
|
}
|
|
|
|
static enum nvram_parser_state
|
|
(*nv_parser_states[])(struct nvram_parser *nvp) = {
|
|
brcmf_nvram_handle_idle,
|
|
brcmf_nvram_handle_key,
|
|
brcmf_nvram_handle_value,
|
|
brcmf_nvram_handle_comment,
|
|
brcmf_nvram_handle_end
|
|
};
|
|
|
|
static int brcmf_init_nvram_parser(struct nvram_parser *nvp,
|
|
const u8 *data, size_t data_len)
|
|
{
|
|
size_t size;
|
|
|
|
memset(nvp, 0, sizeof(*nvp));
|
|
nvp->data = data;
|
|
/* Limit size to MAX_NVRAM_SIZE, some files contain lot of comment */
|
|
if (data_len > BRCMF_FW_MAX_NVRAM_SIZE)
|
|
size = BRCMF_FW_MAX_NVRAM_SIZE;
|
|
else
|
|
size = data_len;
|
|
/* Add space for properties we may add */
|
|
size += strlen(BRCMF_FW_DEFAULT_BOARDREV) + 1;
|
|
/* Alloc for extra 0 byte + roundup by 4 + length field */
|
|
size += 1 + 3 + sizeof(u32);
|
|
nvp->nvram = kzalloc(size, GFP_KERNEL);
|
|
if (!nvp->nvram)
|
|
return -ENOMEM;
|
|
|
|
nvp->line = 1;
|
|
nvp->column = 1;
|
|
return 0;
|
|
}
|
|
|
|
/* brcmf_fw_strip_multi_v1 :Some nvram files contain settings for multiple
|
|
* devices. Strip it down for one device, use domain_nr/bus_nr to determine
|
|
* which data is to be returned. v1 is the version where nvram is stored
|
|
* compressed and "devpath" maps to index for valid entries.
|
|
*/
|
|
static void brcmf_fw_strip_multi_v1(struct nvram_parser *nvp, u16 domain_nr,
|
|
u16 bus_nr)
|
|
{
|
|
/* Device path with a leading '=' key-value separator */
|
|
char pci_path[] = "=pci/?/?";
|
|
size_t pci_len;
|
|
char pcie_path[] = "=pcie/?/?";
|
|
size_t pcie_len;
|
|
|
|
u32 i, j;
|
|
bool found;
|
|
u8 *nvram;
|
|
u8 id;
|
|
|
|
nvram = kzalloc(nvp->nvram_len + 1 + 3 + sizeof(u32), GFP_KERNEL);
|
|
if (!nvram)
|
|
goto fail;
|
|
|
|
/* min length: devpath0=pcie/1/4/ + 0:x=y */
|
|
if (nvp->nvram_len < BRCMF_FW_NVRAM_DEVPATH_LEN + 6)
|
|
goto fail;
|
|
|
|
/* First search for the devpathX and see if it is the configuration
|
|
* for domain_nr/bus_nr. Search complete nvp
|
|
*/
|
|
snprintf(pci_path, sizeof(pci_path), "=pci/%d/%d", domain_nr,
|
|
bus_nr);
|
|
pci_len = strlen(pci_path);
|
|
snprintf(pcie_path, sizeof(pcie_path), "=pcie/%d/%d", domain_nr,
|
|
bus_nr);
|
|
pcie_len = strlen(pcie_path);
|
|
found = false;
|
|
i = 0;
|
|
while (i < nvp->nvram_len - BRCMF_FW_NVRAM_DEVPATH_LEN) {
|
|
/* Format: devpathX=pcie/Y/Z/
|
|
* Y = domain_nr, Z = bus_nr, X = virtual ID
|
|
*/
|
|
if (strncmp(&nvp->nvram[i], "devpath", 7) == 0 &&
|
|
(!strncmp(&nvp->nvram[i + 8], pci_path, pci_len) ||
|
|
!strncmp(&nvp->nvram[i + 8], pcie_path, pcie_len))) {
|
|
id = nvp->nvram[i + 7] - '0';
|
|
found = true;
|
|
break;
|
|
}
|
|
while (nvp->nvram[i] != 0)
|
|
i++;
|
|
i++;
|
|
}
|
|
if (!found)
|
|
goto fail;
|
|
|
|
/* Now copy all valid entries, release old nvram and assign new one */
|
|
i = 0;
|
|
j = 0;
|
|
while (i < nvp->nvram_len) {
|
|
if ((nvp->nvram[i] - '0' == id) && (nvp->nvram[i + 1] == ':')) {
|
|
i += 2;
|
|
if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
|
|
nvp->boardrev_found = true;
|
|
while (nvp->nvram[i] != 0) {
|
|
nvram[j] = nvp->nvram[i];
|
|
i++;
|
|
j++;
|
|
}
|
|
nvram[j] = 0;
|
|
j++;
|
|
}
|
|
while (nvp->nvram[i] != 0)
|
|
i++;
|
|
i++;
|
|
}
|
|
kfree(nvp->nvram);
|
|
nvp->nvram = nvram;
|
|
nvp->nvram_len = j;
|
|
return;
|
|
|
|
fail:
|
|
kfree(nvram);
|
|
nvp->nvram_len = 0;
|
|
}
|
|
|
|
/* brcmf_fw_strip_multi_v2 :Some nvram files contain settings for multiple
|
|
* devices. Strip it down for one device, use domain_nr/bus_nr to determine
|
|
* which data is to be returned. v2 is the version where nvram is stored
|
|
* uncompressed, all relevant valid entries are identified by
|
|
* pcie/domain_nr/bus_nr:
|
|
*/
|
|
static void brcmf_fw_strip_multi_v2(struct nvram_parser *nvp, u16 domain_nr,
|
|
u16 bus_nr)
|
|
{
|
|
char prefix[BRCMF_FW_NVRAM_PCIEDEV_LEN];
|
|
size_t len;
|
|
u32 i, j;
|
|
u8 *nvram;
|
|
|
|
nvram = kzalloc(nvp->nvram_len + 1 + 3 + sizeof(u32), GFP_KERNEL);
|
|
if (!nvram)
|
|
goto fail;
|
|
|
|
/* Copy all valid entries, release old nvram and assign new one.
|
|
* Valid entries are of type pcie/X/Y/ where X = domain_nr and
|
|
* Y = bus_nr.
|
|
*/
|
|
snprintf(prefix, sizeof(prefix), "pcie/%d/%d/", domain_nr, bus_nr);
|
|
len = strlen(prefix);
|
|
i = 0;
|
|
j = 0;
|
|
while (i < nvp->nvram_len - len) {
|
|
if (strncmp(&nvp->nvram[i], prefix, len) == 0) {
|
|
i += len;
|
|
if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
|
|
nvp->boardrev_found = true;
|
|
while (nvp->nvram[i] != 0) {
|
|
nvram[j] = nvp->nvram[i];
|
|
i++;
|
|
j++;
|
|
}
|
|
nvram[j] = 0;
|
|
j++;
|
|
}
|
|
while (nvp->nvram[i] != 0)
|
|
i++;
|
|
i++;
|
|
}
|
|
kfree(nvp->nvram);
|
|
nvp->nvram = nvram;
|
|
nvp->nvram_len = j;
|
|
return;
|
|
fail:
|
|
kfree(nvram);
|
|
nvp->nvram_len = 0;
|
|
}
|
|
|
|
static void brcmf_fw_add_defaults(struct nvram_parser *nvp)
|
|
{
|
|
if (nvp->boardrev_found)
|
|
return;
|
|
|
|
memcpy(&nvp->nvram[nvp->nvram_len], &BRCMF_FW_DEFAULT_BOARDREV,
|
|
strlen(BRCMF_FW_DEFAULT_BOARDREV));
|
|
nvp->nvram_len += strlen(BRCMF_FW_DEFAULT_BOARDREV);
|
|
nvp->nvram[nvp->nvram_len] = '\0';
|
|
nvp->nvram_len++;
|
|
}
|
|
|
|
/* brcmf_nvram_strip :Takes a buffer of "<var>=<value>\n" lines read from a fil
|
|
* and ending in a NUL. Removes carriage returns, empty lines, comment lines,
|
|
* and converts newlines to NULs. Shortens buffer as needed and pads with NULs.
|
|
* End of buffer is completed with token identifying length of buffer.
|
|
*/
|
|
static void *brcmf_fw_nvram_strip(const u8 *data, size_t data_len,
|
|
u32 *new_length, u16 domain_nr, u16 bus_nr)
|
|
{
|
|
struct nvram_parser nvp;
|
|
u32 pad;
|
|
u32 token;
|
|
__le32 token_le;
|
|
|
|
if (brcmf_init_nvram_parser(&nvp, data, data_len) < 0)
|
|
return NULL;
|
|
|
|
while (nvp.pos < data_len) {
|
|
nvp.state = nv_parser_states[nvp.state](&nvp);
|
|
if (nvp.state == END)
|
|
break;
|
|
}
|
|
if (nvp.multi_dev_v1) {
|
|
nvp.boardrev_found = false;
|
|
brcmf_fw_strip_multi_v1(&nvp, domain_nr, bus_nr);
|
|
} else if (nvp.multi_dev_v2) {
|
|
nvp.boardrev_found = false;
|
|
brcmf_fw_strip_multi_v2(&nvp, domain_nr, bus_nr);
|
|
}
|
|
|
|
if (nvp.nvram_len == 0) {
|
|
kfree(nvp.nvram);
|
|
return NULL;
|
|
}
|
|
|
|
brcmf_fw_add_defaults(&nvp);
|
|
|
|
pad = nvp.nvram_len;
|
|
*new_length = roundup(nvp.nvram_len + 1, 4);
|
|
while (pad != *new_length) {
|
|
nvp.nvram[pad] = 0;
|
|
pad++;
|
|
}
|
|
|
|
token = *new_length / 4;
|
|
token = (~token << 16) | (token & 0x0000FFFF);
|
|
token_le = cpu_to_le32(token);
|
|
|
|
memcpy(&nvp.nvram[*new_length], &token_le, sizeof(token_le));
|
|
*new_length += sizeof(token_le);
|
|
|
|
return nvp.nvram;
|
|
}
|
|
|
|
void brcmf_fw_nvram_free(void *nvram)
|
|
{
|
|
kfree(nvram);
|
|
}
|
|
|
|
struct brcmf_fw {
|
|
struct device *dev;
|
|
u16 flags;
|
|
const struct firmware *code;
|
|
const char *nvram_name;
|
|
u16 domain_nr;
|
|
u16 bus_nr;
|
|
void (*done)(struct device *dev, int err, const struct firmware *fw,
|
|
void *nvram_image, u32 nvram_len);
|
|
};
|
|
|
|
static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
|
|
{
|
|
struct brcmf_fw *fwctx = ctx;
|
|
u32 nvram_length = 0;
|
|
void *nvram = NULL;
|
|
u8 *data = NULL;
|
|
size_t data_len;
|
|
bool raw_nvram;
|
|
|
|
brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(fwctx->dev));
|
|
if (fw && fw->data) {
|
|
data = (u8 *)fw->data;
|
|
data_len = fw->size;
|
|
raw_nvram = false;
|
|
} else {
|
|
data = bcm47xx_nvram_get_contents(&data_len);
|
|
if (!data && !(fwctx->flags & BRCMF_FW_REQ_NV_OPTIONAL))
|
|
goto fail;
|
|
raw_nvram = true;
|
|
}
|
|
|
|
if (data)
|
|
nvram = brcmf_fw_nvram_strip(data, data_len, &nvram_length,
|
|
fwctx->domain_nr, fwctx->bus_nr);
|
|
|
|
if (raw_nvram)
|
|
bcm47xx_nvram_release_contents(data);
|
|
release_firmware(fw);
|
|
if (!nvram && !(fwctx->flags & BRCMF_FW_REQ_NV_OPTIONAL))
|
|
goto fail;
|
|
|
|
fwctx->done(fwctx->dev, 0, fwctx->code, nvram, nvram_length);
|
|
kfree(fwctx);
|
|
return;
|
|
|
|
fail:
|
|
brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
|
|
release_firmware(fwctx->code);
|
|
fwctx->done(fwctx->dev, -ENOENT, NULL, NULL, 0);
|
|
kfree(fwctx);
|
|
}
|
|
|
|
static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx)
|
|
{
|
|
struct brcmf_fw *fwctx = ctx;
|
|
int ret = 0;
|
|
|
|
brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(fwctx->dev));
|
|
if (!fw) {
|
|
ret = -ENOENT;
|
|
goto fail;
|
|
}
|
|
/* only requested code so done here */
|
|
if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM))
|
|
goto done;
|
|
|
|
fwctx->code = fw;
|
|
ret = request_firmware_nowait(THIS_MODULE, true, fwctx->nvram_name,
|
|
fwctx->dev, GFP_KERNEL, fwctx,
|
|
brcmf_fw_request_nvram_done);
|
|
|
|
/* pass NULL to nvram callback for bcm47xx fallback */
|
|
if (ret)
|
|
brcmf_fw_request_nvram_done(NULL, fwctx);
|
|
return;
|
|
|
|
fail:
|
|
brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
|
|
done:
|
|
fwctx->done(fwctx->dev, ret, fw, NULL, 0);
|
|
kfree(fwctx);
|
|
}
|
|
|
|
int brcmf_fw_get_firmwares_pcie(struct device *dev, u16 flags,
|
|
const char *code, const char *nvram,
|
|
void (*fw_cb)(struct device *dev, int err,
|
|
const struct firmware *fw,
|
|
void *nvram_image, u32 nvram_len),
|
|
u16 domain_nr, u16 bus_nr)
|
|
{
|
|
struct brcmf_fw *fwctx;
|
|
|
|
brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
|
|
if (!fw_cb || !code)
|
|
return -EINVAL;
|
|
|
|
if ((flags & BRCMF_FW_REQUEST_NVRAM) && !nvram)
|
|
return -EINVAL;
|
|
|
|
fwctx = kzalloc(sizeof(*fwctx), GFP_KERNEL);
|
|
if (!fwctx)
|
|
return -ENOMEM;
|
|
|
|
fwctx->dev = dev;
|
|
fwctx->flags = flags;
|
|
fwctx->done = fw_cb;
|
|
if (flags & BRCMF_FW_REQUEST_NVRAM)
|
|
fwctx->nvram_name = nvram;
|
|
fwctx->domain_nr = domain_nr;
|
|
fwctx->bus_nr = bus_nr;
|
|
|
|
return request_firmware_nowait(THIS_MODULE, true, code, dev,
|
|
GFP_KERNEL, fwctx,
|
|
brcmf_fw_request_code_done);
|
|
}
|
|
|
|
int brcmf_fw_get_firmwares(struct device *dev, u16 flags,
|
|
const char *code, const char *nvram,
|
|
void (*fw_cb)(struct device *dev, int err,
|
|
const struct firmware *fw,
|
|
void *nvram_image, u32 nvram_len))
|
|
{
|
|
return brcmf_fw_get_firmwares_pcie(dev, flags, code, nvram, fw_cb, 0,
|
|
0);
|
|
}
|
|
|
|
int brcmf_fw_map_chip_to_name(u32 chip, u32 chiprev,
|
|
struct brcmf_firmware_mapping mapping_table[],
|
|
u32 table_size, char fw_name[BRCMF_FW_NAME_LEN],
|
|
char nvram_name[BRCMF_FW_NAME_LEN])
|
|
{
|
|
u32 i;
|
|
char end;
|
|
|
|
if (chiprev >= BITS_PER_TYPE(u32)) {
|
|
brcmf_err("Invalid chip revision %u\n", chiprev);
|
|
return NULL;
|
|
}
|
|
|
|
for (i = 0; i < table_size; i++) {
|
|
if (mapping_table[i].chipid == chip &&
|
|
mapping_table[i].revmask & BIT(chiprev))
|
|
break;
|
|
}
|
|
|
|
if (i == table_size) {
|
|
brcmf_err("Unknown chipid %d [%d]\n", chip, chiprev);
|
|
return -ENODEV;
|
|
}
|
|
|
|
/* check if firmware path is provided by module parameter */
|
|
if (brcmf_mp_global.firmware_path[0] != '\0') {
|
|
strlcpy(fw_name, brcmf_mp_global.firmware_path,
|
|
BRCMF_FW_NAME_LEN);
|
|
if ((nvram_name) && (mapping_table[i].nvram))
|
|
strlcpy(nvram_name, brcmf_mp_global.firmware_path,
|
|
BRCMF_FW_NAME_LEN);
|
|
|
|
end = brcmf_mp_global.firmware_path[
|
|
strlen(brcmf_mp_global.firmware_path) - 1];
|
|
if (end != '/') {
|
|
strlcat(fw_name, "/", BRCMF_FW_NAME_LEN);
|
|
if ((nvram_name) && (mapping_table[i].nvram))
|
|
strlcat(nvram_name, "/", BRCMF_FW_NAME_LEN);
|
|
}
|
|
}
|
|
strlcat(fw_name, mapping_table[i].fw, BRCMF_FW_NAME_LEN);
|
|
if ((nvram_name) && (mapping_table[i].nvram))
|
|
strlcat(nvram_name, mapping_table[i].nvram, BRCMF_FW_NAME_LEN);
|
|
|
|
return 0;
|
|
}
|
|
|