Merge tag 'wireless-drivers-next-for-davem-2017-11-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 4.15

Last minute patches before the merge window. Not really anything
special standing out, mostly fixes or cleanup and some minor new
features.

Major changes:

iwlwifi

* some new PCI IDs
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 13 insertions, 124 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/paging.h b/drivers/net/wireless/intel/iwlwifi/fw/api/paging.h
index e76f9cd4473d..721b9fed7201 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/paging.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/paging.h
@@ -81,28 +81,4 @@ struct iwl_fw_paging_cmd {
         __le32 device_phy_addr[NUM_OF_FW_PAGING_BLOCKS];
 } __packed; /* FW_PAGING_BLOCK_CMD_API_S_VER_1 */
 
-/**
- * enum iwl_fw_item_id - FW item IDs
- *
- * @IWL_FW_ITEM_ID_PAGING: Address of the pages that the FW will upload
- *      download
- */
-enum iwl_fw_item_id {
-        IWL_FW_ITEM_ID_PAGING = 3,
-};
-
-/**
- * struct iwl_fw_get_item_cmd - get an item from the fw
- * @item_id: ID of item to obtain, see &enum iwl_fw_item_id
- */
-struct iwl_fw_get_item_cmd {
-        __le32 item_id;
-} __packed; /* FW_GET_ITEM_CMD_API_S_VER_1 */
-
-struct iwl_fw_get_item_resp {
-        __le32 item_id;
-        __le32 item_byte_cnt;
-        __le32 item_val;
-} __packed; /* FW_GET_ITEM_RSP_S_VER_1 */
-
 #endif /* __iwl_fw_api_paging_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
index efd7fb65de8b..740d97093d1c 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@ -136,7 +136,7 @@ enum iwl_ucode_tlv_type {
         IWL_UCODE_TLV_N_SCAN_CHANNELS           = 31,
         IWL_UCODE_TLV_PAGING            = 32,
         IWL_UCODE_TLV_SEC_RT_USNIFFER   = 34,
-        IWL_UCODE_TLV_SDIO_ADMA_ADDR    = 35,
+        /* 35 is unused */
         IWL_UCODE_TLV_FW_VERSION        = 36,
         IWL_UCODE_TLV_FW_DBG_DEST       = 38,
         IWL_UCODE_TLV_FW_DBG_CONF       = 39,
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.h b/drivers/net/wireless/intel/iwlwifi/fw/img.h
index e6bc9cb60700..985496cc01d0 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/img.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/img.h
@@ -138,11 +138,6 @@ struct fw_img {
         u32 paging_mem_size;
 };
 
-struct iwl_sf_region {
-        u32 addr;
-        u32 size;
-};
-
 /*
  * Block paging calculations
  */
@@ -257,7 +252,6 @@ enum iwl_fw_type {
  * @type: firmware type (&enum iwl_fw_type)
  * @cipher_scheme: optional external cipher scheme.
  * @human_readable: human readable version
- * @sdio_adma_addr: the default address to set for the ADMA in SDIO mode until
  *      we get the ALIVE from the uCode
  * @dbg_dest_tlv: points to the destination TLV for debug
  * @dbg_conf_tlv: array of pointers to configuration TLVs for debug
@@ -290,8 +284,6 @@ struct iwl_fw {
         struct iwl_fw_cipher_scheme cs[IWL_UCODE_MAX_CS];
         u8 human_readable[FW_VER_HUMAN_READABLE_SZ];
 
-        u32 sdio_adma_addr;
-
         struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;
         struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];
         size_t dbg_conf_tlv_len[FW_DBG_CONF_MAX];
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/paging.c b/drivers/net/wireless/intel/iwlwifi/fw/paging.c
index 1610722b8099..1fec8e3a6b35 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/paging.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/paging.c
@@ -87,9 +87,6 @@ void iwl_free_fw_paging(struct iwl_fw_runtime *fwrt)
                              get_order(paging->fw_paging_size));
                 paging->fw_paging_block = NULL;
         }
-        kfree(fwrt->trans->paging_download_buf);
-        fwrt->trans->paging_download_buf = NULL;
-        fwrt->trans->paging_db = NULL;
 
         memset(fwrt->fw_paging_db, 0, sizeof(fwrt->fw_paging_db));
 }
@@ -100,13 +97,11 @@ static int iwl_alloc_fw_paging_mem(struct iwl_fw_runtime *fwrt,
 {
         struct page *block;
         dma_addr_t phys = 0;
-        int blk_idx, order, num_of_pages, size, dma_enabled;
+        int blk_idx, order, num_of_pages, size;
 
         if (fwrt->fw_paging_db[0].fw_paging_block)
                 return 0;
 
-        dma_enabled = is_device_dma_capable(fwrt->trans->dev);
-
         /* ensure BLOCK_2_EXP_SIZE is power of 2 of PAGING_BLOCK_SIZE */
         BUILD_BUG_ON(BIT(BLOCK_2_EXP_SIZE) != PAGING_BLOCK_SIZE);
 
@@ -139,24 +134,18 @@ static int iwl_alloc_fw_paging_mem(struct iwl_fw_runtime *fwrt,
                 fwrt->fw_paging_db[blk_idx].fw_paging_block = block;
                 fwrt->fw_paging_db[blk_idx].fw_paging_size = size;
 
-                if (dma_enabled) {
-                        phys = dma_map_page(fwrt->trans->dev, block, 0,
-                                            PAGE_SIZE << order,
-                                            DMA_BIDIRECTIONAL);
-                        if (dma_mapping_error(fwrt->trans->dev, phys)) {
-                                /*
-                                 * free the previous pages and the current one
-                                 * since we failed to map_page.
-                                 */
-                                iwl_free_fw_paging(fwrt);
-                                return -ENOMEM;
-                        }
-                        fwrt->fw_paging_db[blk_idx].fw_paging_phys = phys;
-                } else {
-                        fwrt->fw_paging_db[blk_idx].fw_paging_phys =
-                                PAGING_ADDR_SIG |
-                                blk_idx << BLOCK_2_EXP_SIZE;
+                phys = dma_map_page(fwrt->trans->dev, block, 0,
+                                    PAGE_SIZE << order,
+                                    DMA_BIDIRECTIONAL);
+                if (dma_mapping_error(fwrt->trans->dev, phys)) {
+                        /*
+                         * free the previous pages and the current one
+                         * since we failed to map_page.
+                         */
+                        iwl_free_fw_paging(fwrt);
+                        return -ENOMEM;
                 }
+                fwrt->fw_paging_db[blk_idx].fw_paging_phys = phys;
 
                 if (!blk_idx)
                         IWL_DEBUG_FW(fwrt,
@@ -312,60 +301,6 @@ static int iwl_send_paging_cmd(struct iwl_fw_runtime *fwrt,
         return iwl_trans_send_cmd(fwrt->trans, &hcmd);
 }
 
-/*
- * Send paging item cmd to FW in case CPU2 has paging image
- */
-static int iwl_trans_get_paging_item(struct iwl_fw_runtime *fwrt)
-{
-        int ret;
-        struct iwl_fw_get_item_cmd fw_get_item_cmd = {
-                .item_id = cpu_to_le32(IWL_FW_ITEM_ID_PAGING),
-        };
-        struct iwl_fw_get_item_resp *item_resp;
-        struct iwl_host_cmd cmd = {
-                .id = iwl_cmd_id(FW_GET_ITEM_CMD, IWL_ALWAYS_LONG_GROUP, 0),
-                .flags = CMD_WANT_SKB | CMD_SEND_IN_RFKILL,
-                .data = { &fw_get_item_cmd, },
-                .len = { sizeof(fw_get_item_cmd), },
-        };
-
-        ret = iwl_trans_send_cmd(fwrt->trans, &cmd);
-        if (ret) {
-                IWL_ERR(fwrt,
-                        "Paging: Failed to send FW_GET_ITEM_CMD cmd (err = %d)\n",
-                        ret);
-                return ret;
-        }
-
-        item_resp = (void *)((struct iwl_rx_packet *)cmd.resp_pkt)->data;
-        if (item_resp->item_id != cpu_to_le32(IWL_FW_ITEM_ID_PAGING)) {
-                IWL_ERR(fwrt,
-                        "Paging: got wrong item in FW_GET_ITEM_CMD resp (item_id = %u)\n",
-                        le32_to_cpu(item_resp->item_id));
-                ret = -EIO;
-                goto exit;
-        }
-
-        /* Add an extra page for headers */
-        fwrt->trans->paging_download_buf = kzalloc(PAGING_BLOCK_SIZE +
-                                                  FW_PAGING_SIZE,
-                                                  GFP_KERNEL);
-        if (!fwrt->trans->paging_download_buf) {
-                ret = -ENOMEM;
-                goto exit;
-        }
-        fwrt->trans->paging_req_addr = le32_to_cpu(item_resp->item_val);
-        fwrt->trans->paging_db = fwrt->fw_paging_db;
-        IWL_DEBUG_FW(fwrt,
-                     "Paging: got paging request address (paging_req_addr 0x%08x)\n",
-                     fwrt->trans->paging_req_addr);
-
-exit:
-        iwl_free_resp(&cmd);
-
-        return ret;
-}
-
 int iwl_init_paging(struct iwl_fw_runtime *fwrt, enum iwl_ucode_type type)
 {
         const struct fw_img *fw = &fwrt->fw->img[type];
@@ -382,20 +317,6 @@ int iwl_init_paging(struct iwl_fw_runtime *fwrt, enum iwl_ucode_type type)
         if (!fw->paging_mem_size)
                 return 0;
 
-        /*
-         * When dma is not enabled, the driver needs to copy / write
-         * the downloaded / uploaded page to / from the smem.
-         * This gets the location of the place were the pages are
-         * stored.
-         */
-        if (!is_device_dma_capable(fwrt->trans->dev)) {
-                ret = iwl_trans_get_paging_item(fwrt);
-                if (ret) {
-                        IWL_ERR(fwrt, "failed to get FW paging item\n");
-                        return ret;
-                }
-        }
-
         ret = iwl_save_fw_paging(fwrt, fw);
         if (ret) {
                 IWL_ERR(fwrt, "failed to save the FW paging image\n");