svn commit: r330192 - in stable/11/sys: conf dev/iwm modules/iwm
Eitan Adler
eadler at FreeBSD.org
Thu Mar 1 06:22:16 UTC 2018
Author: eadler
Date: Thu Mar 1 06:22:14 2018
New Revision: 330192
URL: https://svnweb.freebsd.org/changeset/base/330192
Log:
MFC r314192,r314209:
[iwm] Add support for Firmware paging, needed for newer 8000C firmware.
* Uses the IWM_FW_PAGING_BLOCK_CMD firmware command to tell the firmware
what memory ranges to use for paging.
Added:
stable/11/sys/dev/iwm/if_iwm_fw.c
- copied unchanged from r314209, head/sys/dev/iwm/if_iwm_fw.c
stable/11/sys/dev/iwm/if_iwm_fw.h
- copied unchanged from r314209, head/sys/dev/iwm/if_iwm_fw.h
Modified:
stable/11/sys/conf/files
stable/11/sys/dev/iwm/if_iwm.c
stable/11/sys/dev/iwm/if_iwm_debug.h
stable/11/sys/dev/iwm/if_iwmreg.h
stable/11/sys/dev/iwm/if_iwmvar.h
stable/11/sys/modules/iwm/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/conf/files
==============================================================================
--- stable/11/sys/conf/files Thu Mar 1 06:20:16 2018 (r330191)
+++ stable/11/sys/conf/files Thu Mar 1 06:22:14 2018 (r330192)
@@ -1872,6 +1872,7 @@ dev/iwm/if_iwm.c optional iwm
dev/iwm/if_iwm_7000.c optional iwm
dev/iwm/if_iwm_8000.c optional iwm
dev/iwm/if_iwm_binding.c optional iwm
+dev/iwm/if_iwm_fw.c optional iwm
dev/iwm/if_iwm_led.c optional iwm
dev/iwm/if_iwm_mac_ctxt.c optional iwm
dev/iwm/if_iwm_notif_wait.c optional iwm
Modified: stable/11/sys/dev/iwm/if_iwm.c
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm.c Thu Mar 1 06:20:16 2018 (r330191)
+++ stable/11/sys/dev/iwm/if_iwm.c Thu Mar 1 06:22:14 2018 (r330192)
@@ -166,6 +166,7 @@ __FBSDID("$FreeBSD$");
#include <dev/iwm/if_iwm_pcie_trans.h>
#include <dev/iwm/if_iwm_led.h>
+#include <dev/iwm/if_iwm_fw.h>
const uint8_t iwm_nvm_channels[] = {
/* 2.4 GHz */
@@ -2869,9 +2870,21 @@ iwm_mvm_load_ucode_wait_alive(struct iwm_softc *sc,
* included in the IWM_UCODE_INIT image.
*/
if (fw->paging_mem_size) {
- /* XXX implement FW paging */
- device_printf(sc->sc_dev,
- "%s: XXX FW paging not implemented yet\n", __func__);
+ error = iwm_save_fw_paging(sc, fw);
+ if (error) {
+ device_printf(sc->sc_dev,
+ "%s: failed to save the FW paging image\n",
+ __func__);
+ return error;
+ }
+
+ error = iwm_send_paging_cmd(sc, fw);
+ if (error) {
+ device_printf(sc->sc_dev,
+ "%s: failed to send the paging cmd\n", __func__);
+ iwm_free_fw_paging(sc);
+ return error;
+ }
}
if (!error)
@@ -5496,6 +5509,7 @@ iwm_notif_intr(struct iwm_softc *sc)
case IWM_REMOVE_STA:
case IWM_TXPATH_FLUSH:
case IWM_LQ_CMD:
+ case IWM_FW_PAGING_BLOCK_CMD:
case IWM_BT_CONFIG:
case IWM_REPLY_THERMAL_MNG_BACKOFF:
cresp = (void *)pkt->data;
@@ -6451,6 +6465,8 @@ iwm_detach_local(struct iwm_softc *sc, int do_net80211
iwm_dma_contig_free(&sc->ict_dma);
iwm_dma_contig_free(&sc->kw_dma);
iwm_dma_contig_free(&sc->fw_dma);
+
+ iwm_free_fw_paging(sc);
/* Finished with the hardware - detach things */
iwm_pci_detach(dev);
Modified: stable/11/sys/dev/iwm/if_iwm_debug.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm_debug.h Thu Mar 1 06:20:16 2018 (r330191)
+++ stable/11/sys/dev/iwm/if_iwm_debug.h Thu Mar 1 06:22:14 2018 (r330192)
@@ -42,6 +42,7 @@ enum {
IWM_DEBUG_TRANS = 0x00040000, /* Transport layer (eg PCIe) */
IWM_DEBUG_EEPROM = 0x00080000, /* EEPROM/channel information */
IWM_DEBUG_TEMP = 0x00100000, /* Thermal Sensor handling */
+ IWM_DEBUG_FW = 0x00200000, /* Firmware management */
IWM_DEBUG_REGISTER = 0x20000000, /* print chipset register */
IWM_DEBUG_TRACE = 0x40000000, /* Print begin and start driver function */
IWM_DEBUG_FATAL = 0x80000000, /* fatal errors */
Copied: stable/11/sys/dev/iwm/if_iwm_fw.c (from r314209, head/sys/dev/iwm/if_iwm_fw.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/11/sys/dev/iwm/if_iwm_fw.c Thu Mar 1 06:22:14 2018 (r330192, copy of r314209, head/sys/dev/iwm/if_iwm_fw.c)
@@ -0,0 +1,341 @@
+/*-
+ * Based on BSD-licensed source modules in the Linux iwlwifi driver,
+ * which were used as the reference documentation for this implementation.
+ *
+ * Driver version we are currently based off of is
+ * Linux 4.7.3 (tag id d7f6728f57e3ecbb7ef34eb7d9f564d514775d75)
+ *
+ ***********************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license. When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2016 Intel Deutschland GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ * Intel Linux Wireless <linuxwifi at intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_wlan.h"
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/endian.h>
+#include <sys/firmware.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/mutex.h>
+#include <sys/module.h>
+#include <sys/proc.h>
+#include <sys/rman.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/linker.h>
+
+#include <machine/bus.h>
+#include <machine/endian.h>
+#include <machine/resource.h>
+
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+
+#include <net/bpf.h>
+
+#include <net/if.h>
+#include <net/if_var.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/if_ether.h>
+#include <netinet/ip.h>
+
+#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_regdomain.h>
+#include <net80211/ieee80211_ratectl.h>
+#include <net80211/ieee80211_radiotap.h>
+
+#include <dev/iwm/if_iwmreg.h>
+#include <dev/iwm/if_iwmvar.h>
+#include <dev/iwm/if_iwm_debug.h>
+#include <dev/iwm/if_iwm_util.h>
+#include <dev/iwm/if_iwm_fw.h>
+
+void
+iwm_free_fw_paging(struct iwm_softc *sc)
+{
+ int i;
+
+ if (sc->fw_paging_db[0].fw_paging_block.vaddr == NULL)
+ return;
+
+ for (i = 0; i < IWM_NUM_OF_FW_PAGING_BLOCKS; i++) {
+ iwm_dma_contig_free(&sc->fw_paging_db[i].fw_paging_block);
+ }
+
+ memset(sc->fw_paging_db, 0, sizeof(sc->fw_paging_db));
+}
+
+static int
+iwm_fill_paging_mem(struct iwm_softc *sc, const struct iwm_fw_sects *image)
+{
+ int sec_idx, idx;
+ uint32_t offset = 0;
+
+ /*
+ * find where is the paging image start point:
+ * if CPU2 exist and it's in paging format, then the image looks like:
+ * CPU1 sections (2 or more)
+ * CPU1_CPU2_SEPARATOR_SECTION delimiter - separate between CPU1 to CPU2
+ * CPU2 sections (not paged)
+ * PAGING_SEPARATOR_SECTION delimiter - separate between CPU2
+ * non paged to CPU2 paging sec
+ * CPU2 paging CSS
+ * CPU2 paging image (including instruction and data)
+ */
+ for (sec_idx = 0; sec_idx < IWM_UCODE_SECTION_MAX; sec_idx++) {
+ if (image->fw_sect[sec_idx].offset == IWM_PAGING_SEPARATOR_SECTION) {
+ sec_idx++;
+ break;
+ }
+ }
+
+ /*
+ * If paging is enabled there should be at least 2 more sections left
+ * (one for CSS and one for Paging data)
+ */
+ if (sec_idx >= nitems(image->fw_sect) - 1) {
+ device_printf(sc->sc_dev,
+ "Paging: Missing CSS and/or paging sections\n");
+ iwm_free_fw_paging(sc);
+ return EINVAL;
+ }
+
+ /* copy the CSS block to the dram */
+ IWM_DPRINTF(sc, IWM_DEBUG_FW,
+ "Paging: load paging CSS to FW, sec = %d\n",
+ sec_idx);
+
+ memcpy(sc->fw_paging_db[0].fw_paging_block.vaddr,
+ image->fw_sect[sec_idx].data,
+ sc->fw_paging_db[0].fw_paging_size);
+
+ IWM_DPRINTF(sc, IWM_DEBUG_FW,
+ "Paging: copied %d CSS bytes to first block\n",
+ sc->fw_paging_db[0].fw_paging_size);
+
+ sec_idx++;
+
+ /*
+ * copy the paging blocks to the dram
+ * loop index start from 1 since that CSS block already copied to dram
+ * and CSS index is 0.
+ * loop stop at num_of_paging_blk since that last block is not full.
+ */
+ for (idx = 1; idx < sc->num_of_paging_blk; idx++) {
+ memcpy(sc->fw_paging_db[idx].fw_paging_block.vaddr,
+ (const char *)image->fw_sect[sec_idx].data + offset,
+ sc->fw_paging_db[idx].fw_paging_size);
+
+ IWM_DPRINTF(sc, IWM_DEBUG_FW,
+ "Paging: copied %d paging bytes to block %d\n",
+ sc->fw_paging_db[idx].fw_paging_size,
+ idx);
+
+ offset += sc->fw_paging_db[idx].fw_paging_size;
+ }
+
+ /* copy the last paging block */
+ if (sc->num_of_pages_in_last_blk > 0) {
+ memcpy(sc->fw_paging_db[idx].fw_paging_block.vaddr,
+ (const char *)image->fw_sect[sec_idx].data + offset,
+ IWM_FW_PAGING_SIZE * sc->num_of_pages_in_last_blk);
+
+ IWM_DPRINTF(sc, IWM_DEBUG_FW,
+ "Paging: copied %d pages in the last block %d\n",
+ sc->num_of_pages_in_last_blk, idx);
+ }
+
+ return 0;
+}
+
+static int
+iwm_alloc_fw_paging_mem(struct iwm_softc *sc, const struct iwm_fw_sects *image)
+{
+ int blk_idx = 0;
+ int error, num_of_pages;
+
+ if (sc->fw_paging_db[0].fw_paging_block.vaddr != NULL) {
+ int i;
+ /* Device got reset, and we setup firmware paging again */
+ for (i = 0; i < sc->num_of_paging_blk + 1; i++) {
+ bus_dmamap_sync(sc->sc_dmat,
+ sc->fw_paging_db[i].fw_paging_block.map,
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+ }
+ return 0;
+ }
+
+ /* ensure IWM_BLOCK_2_EXP_SIZE is power of 2 of IWM_PAGING_BLOCK_SIZE */
+ _Static_assert((1 << IWM_BLOCK_2_EXP_SIZE) == IWM_PAGING_BLOCK_SIZE,
+ "IWM_BLOCK_2_EXP_SIZE must be power of 2 of IWM_PAGING_BLOCK_SIZE");
+
+ num_of_pages = image->paging_mem_size / IWM_FW_PAGING_SIZE;
+ sc->num_of_paging_blk = ((num_of_pages - 1) /
+ IWM_NUM_OF_PAGE_PER_GROUP) + 1;
+
+ sc->num_of_pages_in_last_blk =
+ num_of_pages -
+ IWM_NUM_OF_PAGE_PER_GROUP * (sc->num_of_paging_blk - 1);
+
+ IWM_DPRINTF(sc, IWM_DEBUG_FW,
+ "Paging: allocating mem for %d paging blocks, each block holds 8 pages, last block holds %d pages\n",
+ sc->num_of_paging_blk,
+ sc->num_of_pages_in_last_blk);
+
+ /* allocate block of 4Kbytes for paging CSS */
+ error = iwm_dma_contig_alloc(sc->sc_dmat,
+ &sc->fw_paging_db[blk_idx].fw_paging_block, IWM_FW_PAGING_SIZE,
+ 4096);
+ if (error) {
+ /* free all the previous pages since we failed */
+ iwm_free_fw_paging(sc);
+ return ENOMEM;
+ }
+
+ sc->fw_paging_db[blk_idx].fw_paging_size = IWM_FW_PAGING_SIZE;
+
+ IWM_DPRINTF(sc, IWM_DEBUG_FW,
+ "Paging: allocated 4K(CSS) bytes for firmware paging.\n");
+
+ /*
+ * allocate blocks in dram.
+ * since that CSS allocated in fw_paging_db[0] loop start from index 1
+ */
+ for (blk_idx = 1; blk_idx < sc->num_of_paging_blk + 1; blk_idx++) {
+ /* allocate block of IWM_PAGING_BLOCK_SIZE (32K) */
+ /* XXX Use iwm_dma_contig_alloc for allocating */
+ error = iwm_dma_contig_alloc(sc->sc_dmat,
+ &sc->fw_paging_db[blk_idx].fw_paging_block,
+ IWM_PAGING_BLOCK_SIZE, 4096);
+ if (error) {
+ /* free all the previous pages since we failed */
+ iwm_free_fw_paging(sc);
+ return ENOMEM;
+ }
+
+ sc->fw_paging_db[blk_idx].fw_paging_size = IWM_PAGING_BLOCK_SIZE;
+
+ IWM_DPRINTF(sc, IWM_DEBUG_FW,
+ "Paging: allocated 32K bytes for firmware paging.\n");
+ }
+
+ return 0;
+}
+
+int
+iwm_save_fw_paging(struct iwm_softc *sc, const struct iwm_fw_sects *fw)
+{
+ int ret;
+
+ ret = iwm_alloc_fw_paging_mem(sc, fw);
+ if (ret)
+ return ret;
+
+ return iwm_fill_paging_mem(sc, fw);
+}
+
+/* send paging cmd to FW in case CPU2 has paging image */
+int
+iwm_send_paging_cmd(struct iwm_softc *sc, const struct iwm_fw_sects *fw)
+{
+ int blk_idx;
+ uint32_t dev_phy_addr;
+ struct iwm_fw_paging_cmd fw_paging_cmd = {
+ .flags =
+ htole32(IWM_PAGING_CMD_IS_SECURED |
+ IWM_PAGING_CMD_IS_ENABLED |
+ (sc->num_of_pages_in_last_blk <<
+ IWM_PAGING_CMD_NUM_OF_PAGES_IN_LAST_GRP_POS)),
+ .block_size = htole32(IWM_BLOCK_2_EXP_SIZE),
+ .block_num = htole32(sc->num_of_paging_blk),
+ };
+
+ /* loop for for all paging blocks + CSS block */
+ for (blk_idx = 0; blk_idx < sc->num_of_paging_blk + 1; blk_idx++) {
+ dev_phy_addr = htole32(
+ sc->fw_paging_db[blk_idx].fw_paging_block.paddr >>
+ IWM_PAGE_2_EXP_SIZE);
+ fw_paging_cmd.device_phy_addr[blk_idx] = dev_phy_addr;
+ bus_dmamap_sync(sc->sc_dmat,
+ sc->fw_paging_db[blk_idx].fw_paging_block.map,
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+ }
+
+ return iwm_mvm_send_cmd_pdu(sc, iwm_cmd_id(IWM_FW_PAGING_BLOCK_CMD,
+ IWM_ALWAYS_LONG_GROUP, 0),
+ 0, sizeof(fw_paging_cmd), &fw_paging_cmd);
+}
Copied: stable/11/sys/dev/iwm/if_iwm_fw.h (from r314209, head/sys/dev/iwm/if_iwm_fw.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/11/sys/dev/iwm/if_iwm_fw.h Thu Mar 1 06:22:14 2018 (r330192, copy of r314209, head/sys/dev/iwm/if_iwm_fw.h)
@@ -0,0 +1,113 @@
+/*-
+ * Based on BSD-licensed source modules in the Linux iwlwifi driver,
+ * which were used as the reference documentation for this implementation.
+ *
+ * Driver version we are currently based off of is
+ * Linux 4.7.3 (tag id d7f6728f57e3ecbb7ef34eb7d9f564d514775d75)
+ *
+ ***********************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license. When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2016 Intel Deutschland GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
+ *
+ * Contact Information:
+ * Intel Linux Wireless <linuxwifi at intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2016 Intel Deutschland GmbH
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * $FreeBSD$
+ */
+#ifndef __IF_IWM_FW_H__
+#define __IF_IWM_FW_H__
+
+/*
+ * Block paging calculations
+ */
+#define IWM_PAGE_2_EXP_SIZE 12 /* 4K == 2^12 */
+#define IWM_FW_PAGING_SIZE (1 << IWM_PAGE_2_EXP_SIZE) /* page size is 4KB */
+#define IWM_PAGE_PER_GROUP_2_EXP_SIZE 3
+/* 8 pages per group */
+#define IWM_NUM_OF_PAGE_PER_GROUP (1 << IWM_PAGE_PER_GROUP_2_EXP_SIZE)
+/* don't change, support only 32KB size */
+#define IWM_PAGING_BLOCK_SIZE (IWM_NUM_OF_PAGE_PER_GROUP * IWM_FW_PAGING_SIZE)
+/* 32K == 2^15 */
+#define IWM_BLOCK_2_EXP_SIZE (IWM_PAGE_2_EXP_SIZE + IWM_PAGE_PER_GROUP_2_EXP_SIZE)
+
+/*
+ * Image paging calculations
+ */
+#define IWM_BLOCK_PER_IMAGE_2_EXP_SIZE 5
+/* 2^5 == 32 blocks per image */
+#define IWM_NUM_OF_BLOCK_PER_IMAGE (1 << IWM_BLOCK_PER_IMAGE_2_EXP_SIZE)
+/* maximum image size 1024KB */
+#define IWM_MAX_PAGING_IMAGE_SIZE (IWM_NUM_OF_BLOCK_PER_IMAGE * IWM_PAGING_BLOCK_SIZE)
+
+/* Virtual address signature */
+#define IWM_PAGING_ADDR_SIG 0xAA000000
+
+#define IWM_PAGING_CMD_IS_SECURED (1 << 9)
+#define IWM_PAGING_CMD_IS_ENABLED (1 << 8)
+#define IWM_PAGING_CMD_NUM_OF_PAGES_IN_LAST_GRP_POS 0
+#define IWM_PAGING_TLV_SECURE_MASK 1
+
+extern void iwm_free_fw_paging(struct iwm_softc *);
+extern int iwm_save_fw_paging(struct iwm_softc *, const struct iwm_fw_sects *);
+extern int iwm_send_paging_cmd(struct iwm_softc *, const struct iwm_fw_sects *);
+
+#endif /* __IF_IWM_FW_H__ */
Modified: stable/11/sys/dev/iwm/if_iwmreg.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwmreg.h Thu Mar 1 06:20:16 2018 (r330191)
+++ stable/11/sys/dev/iwm/if_iwmreg.h Thu Mar 1 06:22:14 2018 (r330192)
@@ -888,28 +888,6 @@ struct iwm_fw_cipher_scheme {
uint8_t hw_cipher;
} __packed;
-/*
- * Block paging calculations
- */
-#define IWM_PAGE_2_EXP_SIZE 12 /* 4K == 2^12 */
-#define IWM_FW_PAGING_SIZE (1 << IWM_PAGE_2_EXP_SIZE) /* page size is 4KB */
-#define IWM_PAGE_PER_GROUP_2_EXP_SIZE 3
-/* 8 pages per group */
-#define IWM_NUM_OF_PAGE_PER_GROUP (1 << IWM_PAGE_PER_GROUP_2_EXP_SIZE)
-/* don't change, support only 32KB size */
-#define IWM_PAGING_BLOCK_SIZE (IWM_NUM_OF_PAGE_PER_GROUP * IWM_FW_PAGING_SIZE)
-/* 32K == 2^15 */
-#define IWM_BLOCK_2_EXP_SIZE (IWM_PAGE_2_EXP_SIZE + IWM_PAGE_PER_GROUP_2_EXP_SIZE)
-
-/*
- * Image paging calculations
- */
-#define IWM_BLOCK_PER_IMAGE_2_EXP_SIZE 5
-/* 2^5 == 32 blocks per image */
-#define IWM_NUM_OF_BLOCK_PER_IMAGE (1 << IWM_BLOCK_PER_IMAGE_2_EXP_SIZE)
-/* maximum image size 1024KB */
-#define IWM_MAX_PAGING_IMAGE_SIZE (IWM_NUM_OF_BLOCK_PER_IMAGE * IWM_PAGING_BLOCK_SIZE)
-
/**
* struct iwm_fw_cscheme_list - a cipher scheme list
* @size: a number of entries
@@ -1842,12 +1820,8 @@ enum {
IWM_LQ_CMD = 0x4e,
- /* Calibration */
- IWM_TEMPERATURE_NOTIFICATION = 0x62,
- IWM_CALIBRATION_CFG_CMD = 0x65,
- IWM_CALIBRATION_RES_NOTIFICATION = 0x66,
- IWM_CALIBRATION_COMPLETE_NOTIFICATION = 0x67,
- IWM_RADIO_VERSION_NOTIFICATION = 0x68,
+ /* paging block to FW cpu2 */
+ IWM_FW_PAGING_BLOCK_CMD = 0x4f,
/* Scan offload */
IWM_SCAN_OFFLOAD_REQUEST_CMD = 0x51,
@@ -2091,6 +2065,44 @@ struct iwm_nvm_access_cmd {
uint16_t length;
uint8_t data[];
} __packed; /* IWM_NVM_ACCESS_CMD_API_S_VER_2 */
+
+#define IWM_NUM_OF_FW_PAGING_BLOCKS 33 /* 32 for data and 1 block for CSS */
+
+/*
+ * struct iwm_fw_paging_cmd - paging layout
+ *
+ * (IWM_FW_PAGING_BLOCK_CMD = 0x4f)
+ *
+ * Send to FW the paging layout in the driver.
+ *
+ * @flags: various flags for the command
+ * @block_size: the block size in powers of 2
+ * @block_num: number of blocks specified in the command.
+ * @device_phy_addr: virtual addresses from device side
+*/
+struct iwm_fw_paging_cmd {
+ uint32_t flags;
+ uint32_t block_size;
+ uint32_t block_num;
+ uint32_t device_phy_addr[IWM_NUM_OF_FW_PAGING_BLOCKS];
+} __packed; /* IWM_FW_PAGING_BLOCK_CMD_API_S_VER_1 */
+
+/*
+ * Fw items ID's
+ *
+ * @IWM_FW_ITEM_ID_PAGING: Address of the pages that the FW will upload
+ * download
+ */
+enum iwm_fw_item_id {
+ IWM_FW_ITEM_ID_PAGING = 3,
+};
+
+/*
+ * struct iwm_fw_get_item_cmd - get an item from the fw
+ */
+struct iwm_fw_get_item_cmd {
+ uint32_t item_id;
+} __packed; /* IWM_FW_GET_ITEM_CMD_API_S_VER_1 */
/**
* struct iwm_nvm_access_resp_ver2 - response to IWM_NVM_ACCESS_CMD
Modified: stable/11/sys/dev/iwm/if_iwmvar.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwmvar.h Thu Mar 1 06:20:16 2018 (r330191)
+++ stable/11/sys/dev/iwm/if_iwmvar.h Thu Mar 1 06:22:14 2018 (r330192)
@@ -246,6 +246,16 @@ struct iwm_dma_info {
bus_size_t size;
};
+/**
+ * struct iwm_fw_paging
+ * @fw_paging_block: dma memory info
+ * @fw_paging_size: page size
+ */
+struct iwm_fw_paging {
+ struct iwm_dma_info fw_paging_block;
+ uint32_t fw_paging_size;
+};
+
#define IWM_TX_RING_COUNT 256
#define IWM_TX_RING_LOMARK 192
#define IWM_TX_RING_HIMARK 224
@@ -499,6 +509,14 @@ struct iwm_softc {
uint32_t log_event_table;
uint32_t umac_error_event_table;
int support_umac_log;
+
+ /*
+ * Paging parameters - All of the parameters should be set by the
+ * opmode when paging is enabled
+ */
+ struct iwm_fw_paging fw_paging_db[IWM_NUM_OF_FW_PAGING_BLOCKS];
+ uint16_t num_of_paging_blk;
+ uint16_t num_of_pages_in_last_blk;
};
#define IWM_LOCK_INIT(_sc) \
Modified: stable/11/sys/modules/iwm/Makefile
==============================================================================
--- stable/11/sys/modules/iwm/Makefile Thu Mar 1 06:20:16 2018 (r330191)
+++ stable/11/sys/modules/iwm/Makefile Thu Mar 1 06:22:14 2018 (r330192)
@@ -7,7 +7,7 @@ KMOD= if_iwm
SRCS= if_iwm.c if_iwm_binding.c if_iwm_util.c if_iwm_phy_db.c
SRCS+= if_iwm_mac_ctxt.c if_iwm_phy_ctxt.c if_iwm_time_event.c
SRCS+= if_iwm_power.c if_iwm_scan.c if_iwm_led.c if_iwm_notif_wait.c
-SRCS+= if_iwm_7000.c if_iwm_8000.c
+SRCS+= if_iwm_7000.c if_iwm_8000.c if_iwm_fw.c
# bus layer
SRCS+= if_iwm_pcie_trans.c
SRCS+= device_if.h bus_if.h pci_if.h opt_wlan.h
More information about the svn-src-stable-11
mailing list