Commit c7e3c93a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2019-06-07' of... 

Merge tag 'wireless-drivers-for-davem-2019-06-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 5.2

First set of fixes for 5.2. Most important here are buffer overflow
fixes for mwifiex.

rtw88

* fix out of bounds compiler warning

* fix rssi handling to get 4x more throughput

* avoid circular locking

rsi

* fix unitilised data warning, these are hopefully the last ones so
  that the warning can be enabled by default

mwifiex

* fix buffer overflows

iwlwifi

* remove not used debugfs file

* various fixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1e1d9263 69ae4f6a

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+39 −0
Original line number Diff line number Diff line
@@ -2747,3 +2747,42 @@ void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t) 
			  jiffies + msecs_to_jiffies(collect_interval));

	}

}



#define FSEQ_REG(x) { .addr = (x), .str = #x, }



void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt)

{

	struct iwl_trans *trans = fwrt->trans;

	unsigned long flags;

	int i;

	struct {

		u32 addr;

		const char *str;

	} fseq_regs[] = {

		FSEQ_REG(FSEQ_ERROR_CODE),

		FSEQ_REG(FSEQ_TOP_INIT_VERSION),

		FSEQ_REG(FSEQ_CNVIO_INIT_VERSION),

		FSEQ_REG(FSEQ_OTP_VERSION),

		FSEQ_REG(FSEQ_TOP_CONTENT_VERSION),

		FSEQ_REG(FSEQ_ALIVE_TOKEN),

		FSEQ_REG(FSEQ_CNVI_ID),

		FSEQ_REG(FSEQ_CNVR_ID),

		FSEQ_REG(CNVI_AUX_MISC_CHIP),

		FSEQ_REG(CNVR_AUX_MISC_CHIP),

		FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_DIG_DCDC_VTRIM),

		FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR),

	};



	if (!iwl_trans_grab_nic_access(trans, &flags))

		return;



	IWL_ERR(fwrt, "Fseq Registers:\n");



	for (i = 0; i < ARRAY_SIZE(fseq_regs); i++)

		IWL_ERR(fwrt, "0x%08X | %s\n",

			iwl_read_prph_no_grab(trans, fseq_regs[i].addr),

			fseq_regs[i].str);



	iwl_trans_release_nic_access(trans, &flags);

}

IWL_EXPORT_SYMBOL(iwl_fw_error_print_fseq_regs);

drivers/net/wireless/intel/iwlwifi/fw/dbg.h

+2 −0
Original line number Diff line number Diff line
@@ -471,4 +471,6 @@ static inline void iwl_fw_error_collect(struct iwl_fw_runtime *fwrt) 
}



void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t);



void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt);

#endif  /* __iwl_fw_dbg_h__ */

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+0 −1
Original line number Diff line number Diff line
@@ -1597,7 +1597,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	goto free;



 out_free_fw:

	iwl_dealloc_ucode(drv);

	release_firmware(ucode_raw);

 out_unbind:

	complete(&drv->request_firmware_complete);

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

+20 −2
Original line number Diff line number Diff line
@@ -395,7 +395,11 @@ enum { 
	WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK	= 0x80000000,

};



#define AUX_MISC_REG			0xA200B0

#define CNVI_AUX_MISC_CHIP				0xA200B0

#define CNVR_AUX_MISC_CHIP				0xA2B800

#define CNVR_SCU_SD_REGS_SD_REG_DIG_DCDC_VTRIM		0xA29890

#define CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR	0xA29938



enum {

	HW_STEP_LOCATION_BITS = 24,

};
@@ -408,7 +412,12 @@ enum aux_misc_master1_en { 
#define AUX_MISC_MASTER1_SMPHR_STATUS	0xA20800

#define RSA_ENABLE			0xA24B08

#define PREG_AUX_BUS_WPROT_0		0xA04CC0

#define PREG_PRPH_WPROT_0		0xA04CE0



/* device family 9000 WPROT register */

#define PREG_PRPH_WPROT_9000		0xA04CE0

/* device family 22000 WPROT register */

#define PREG_PRPH_WPROT_22000		0xA04D00



#define SB_CPU_1_STATUS			0xA01E30

#define SB_CPU_2_STATUS			0xA01E34

#define UMAG_SB_CPU_1_STATUS		0xA038C0
@@ -442,4 +451,13 @@ enum { 


#define UREG_DOORBELL_TO_ISR6		0xA05C04

#define UREG_DOORBELL_TO_ISR6_NMI_BIT	BIT(0)



#define FSEQ_ERROR_CODE			0xA340C8

#define FSEQ_TOP_INIT_VERSION		0xA34038

#define FSEQ_CNVIO_INIT_VERSION		0xA3403C

#define FSEQ_OTP_VERSION		0xA340FC

#define FSEQ_TOP_CONTENT_VERSION	0xA340F4

#define FSEQ_ALIVE_TOKEN		0xA340F0

#define FSEQ_CNVI_ID			0xA3408C

#define FSEQ_CNVR_ID			0xA34090

#endif				/* __iwl_prph_h__ */

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

+0 −22
Original line number Diff line number Diff line
@@ -1972,26 +1972,6 @@ out: 
	}

}



static void iwl_mvm_read_d3_sram(struct iwl_mvm *mvm)

{

#ifdef CONFIG_IWLWIFI_DEBUGFS

	const struct fw_img *img = &mvm->fw->img[IWL_UCODE_WOWLAN];

	u32 len = img->sec[IWL_UCODE_SECTION_DATA].len;

	u32 offs = img->sec[IWL_UCODE_SECTION_DATA].offset;



	if (!mvm->store_d3_resume_sram)

		return;



	if (!mvm->d3_resume_sram) {

		mvm->d3_resume_sram = kzalloc(len, GFP_KERNEL);

		if (!mvm->d3_resume_sram)

			return;

	}



	iwl_trans_read_mem_bytes(mvm->trans, offs, mvm->d3_resume_sram, len);

#endif

}



static void iwl_mvm_d3_disconnect_iter(void *data, u8 *mac,

				       struct ieee80211_vif *vif)

{
@@ -2054,8 +2034,6 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 
	}



	iwl_fw_dbg_read_d3_debug_data(&mvm->fwrt);

	/* query SRAM first in case we want event logging */

	iwl_mvm_read_d3_sram(mvm);



	if (iwl_mvm_check_rt_status(mvm, vif)) {

		set_bit(STATUS_FW_ERROR, &mvm->trans->status);

CRA Git | Maintained and supported by SUSTech CRA and CCSE