svn commit: r319579 - head/sys/dev/iwm

[Adrian Chadd]

Author: adrian
Date: Sun Jun  4 21:11:28 2017
New Revision: 319579
URL: https://svnweb.freebsd.org/changeset/base/319579

Log:
  [iwm] Remove dead code from iwm_pcie_load_cpu_sections().
  
  * If device family is 8000 then iwm_pcie_load_cpu_sections()
    won't be called at all (iwm_pcie_load_cpu_sections_8000() is
    called in that case) so this piece of code never gets called.
  
  Obtained from:	dragonflybsd.git 3e9aaef308100a4d630feffc131e3aca2ae12f8a

Modified:
  head/sys/dev/iwm/if_iwm.c
  head/sys/dev/iwm/if_iwmreg.h

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Sun Jun  4 21:10:14 2017	(r319578)
+++ head/sys/dev/iwm/if_iwm.c	Sun Jun  4 21:11:28 2017	(r319579)
@@ -2571,14 +2571,6 @@ iwm_pcie_load_cpu_sections(struct iwm_softc *sc,
 			return ret;
 	}
 
-	if (sc->cfg->device_family == IWM_DEVICE_FAMILY_8000)
-		iwm_set_bits_prph(sc,
-				  IWM_CSR_UCODE_LOAD_STATUS_ADDR,
-				  (IWM_LMPM_CPU_UCODE_LOADING_COMPLETED |
-				   IWM_LMPM_CPU_HDRS_LOADING_COMPLETED |
-				   IWM_LMPM_CPU_UCODE_LOADING_STARTED) <<
-					shift_param);
-
 	*first_ucode_section = last_read_idx;
 
 	return 0;

Modified: head/sys/dev/iwm/if_iwmreg.h
==============================================================================
--- head/sys/dev/iwm/if_iwmreg.h	Sun Jun  4 21:10:14 2017	(r319578)
+++ head/sys/dev/iwm/if_iwmreg.h	Sun Jun  4 21:11:28 2017	(r319579)
@@ -439,23 +439,11 @@ enum iwm_secure_boot_status_reg {
 };
 
 #define IWM_FH_UCODE_LOAD_STATUS	0x1af0
-#define IWM_CSR_UCODE_LOAD_STATUS_ADDR	0x1e70
-enum iwm_secure_load_status_reg {
-	IWM_LMPM_CPU_UCODE_LOADING_STARTED		= 0x00000001,
-	IWM_LMPM_CPU_HDRS_LOADING_COMPLETED		= 0x00000003,
-	IWM_LMPM_CPU_UCODE_LOADING_COMPLETED		= 0x00000007,
-	IWM_LMPM_CPU_STATUS_NUM_OF_LAST_COMPLETED	= 0x000000F8,
-	IWM_LMPM_CPU_STATUS_NUM_OF_LAST_LOADED_BLOCK	= 0x0000FF00,
-};
 #define IWM_FH_MEM_TB_MAX_LENGTH	0x20000
 
-#define IWM_LMPM_SECURE_INSPECTOR_CODE_ADDR		0x1e38
-#define IWM_LMPM_SECURE_INSPECTOR_DATA_ADDR		0x1e3c
 #define IWM_LMPM_SECURE_UCODE_LOAD_CPU1_HDR_ADDR	0x1e78
 #define IWM_LMPM_SECURE_UCODE_LOAD_CPU2_HDR_ADDR	0x1e7c
 
-#define IWM_LMPM_SECURE_INSPECTOR_CODE_MEM_SPACE	0x400000
-#define IWM_LMPM_SECURE_INSPECTOR_DATA_MEM_SPACE	0x402000
 #define IWM_LMPM_SECURE_CPU1_HDR_MEM_SPACE		0x420000
 #define IWM_LMPM_SECURE_CPU2_HDR_MEM_SPACE		0x420400