Commit b964bfd0 authored by Matti Gottlieb's avatar Matti Gottlieb Committed by Luca Coelho
Browse files

iwlwifi: pcie: add CDB bit to the device configuration parsing 



Some new devices contain an extra bit in the CRF ID register to denote
that they support CDB.  Add definitions and macros to be able to
support it and add the "NO_CDB" to all existing entired.

Signed-off-by: default avatarMatti Gottlieb <matti.gottlieb@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210210142629.7b40184d9899.I3bb2cf9b9afb0457583f786dc52d4d1b1ad75ffc@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 55ae96b6

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+4 −0
Original line number Diff line number Diff line
@@ -445,6 +445,9 @@ struct iwl_cfg { 
#define IWL_CFG_CORES_BT		0x0

#define IWL_CFG_CORES_BT_GNSS		0x5



#define IWL_CFG_NO_CDB			0x0

#define IWL_CFG_CDB			0x1



#define IWL_SUBDEVICE_RF_ID(subdevice)	((u16)((subdevice) & 0x00F0) >> 4)

#define IWL_SUBDEVICE_NO_160(subdevice)	((u16)((subdevice) & 0x0200) >> 9)

#define IWL_SUBDEVICE_CORES(subdevice)	((u16)((subdevice) & 0x1C00) >> 10)
@@ -458,6 +461,7 @@ struct iwl_dev_info { 
	u8 rf_id;

	u8 no_160;

	u8 cores;

	u8 cdb;

	const struct iwl_cfg *cfg;

	const char *name;

};

drivers/net/wireless/intel/iwlwifi/iwl-csr.h

+2 −0
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ 
#define CSR_HW_RFID_DASH(_val)         (((_val) & 0x00000F0) >> 4)

#define CSR_HW_RFID_STEP(_val)         (((_val) & 0x0000F00) >> 8)

#define CSR_HW_RFID_TYPE(_val)         (((_val) & 0x0FFF000) >> 12)

#define CSR_HW_RFID_IS_CDB(_val)       (((_val) & 0x10000000) >> 28)

#define CSR_HW_RFID_IS_JACKET(_val)    (((_val) & 0x20000000) >> 29)



/**

 *  hw_rev values

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+77 −75

File changed.

Preview size limit exceeded, changes collapsed.