Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48c6cc04 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents ba23d206 abae2386

drivers/net/wireless/iwlwifi/dvm/commands.h

+4 −4
Original line number Diff line number Diff line
@@ -3695,7 +3695,7 @@ struct iwl_bt_uart_msg { 
	u8 frame5;

	u8 frame6;

	u8 frame7;

} __attribute__((packed));

} __packed;



struct iwl_bt_coex_profile_notif {

	struct iwl_bt_uart_msg last_bt_uart_msg;
@@ -3703,7 +3703,7 @@ struct iwl_bt_coex_profile_notif { 
	u8 bt_traffic_load; /* 0 .. 3? */

	u8 bt_ci_compliance; /* 0 - not complied, 1 - complied */

	u8 reserved;

} __attribute__((packed));

} __packed;



#define IWL_BT_COEX_PRIO_TBL_SHARED_ANTENNA_POS	0

#define IWL_BT_COEX_PRIO_TBL_SHARED_ANTENNA_MSK	0x1
@@ -3752,7 +3752,7 @@ enum bt_coex_prio_table_priorities { 


struct iwl_bt_coex_prio_table_cmd {

	u8 prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX];

} __attribute__((packed));

} __packed;



#define IWL_BT_COEX_ENV_CLOSE	0

#define IWL_BT_COEX_ENV_OPEN	1
@@ -3764,7 +3764,7 @@ struct iwl_bt_coex_prot_env_cmd { 
	u8 action; /* 0 = closed, 1 = open */

	u8 type; /* 0 .. 15 */

	u8 reserved[2];

} __attribute__((packed));

} __packed;



/*

 * REPLY_D3_CONFIG

drivers/net/wireless/iwlwifi/dvm/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, 
	sram = priv->dbgfs_sram_offset & ~0x3;



	/* read the first u32 from sram */

	val = iwl_read_targ_mem(priv->trans, sram);

	val = iwl_trans_read_mem32(priv->trans, sram);



	for (; len; len--) {

		/* put the address at the start of every line */
@@ -176,7 +176,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, 
		if (++offset == 4) {

			sram += 4;

			offset = 0;

			val = iwl_read_targ_mem(priv->trans, sram);

			val = iwl_trans_read_mem32(priv->trans, sram);

		}



		/* put in extra spaces and split lines for human readability */

drivers/net/wireless/iwlwifi/dvm/led.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static const struct ieee80211_tpt_blink iwl_blink[] = { 
/* Set led register off */

void iwlagn_led_enable(struct iwl_priv *priv)

{

	iwl_write32(priv->trans, CSR_LED_REG, CSR_LED_REG_TRUN_ON);

	iwl_write32(priv->trans, CSR_LED_REG, CSR_LED_REG_TURN_ON);

}



/*

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+4 −4
Original line number Diff line number Diff line
@@ -459,11 +459,11 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) 
	base = priv->device_pointers.error_event_table;

	if (iwlagn_hw_valid_rtc_data_addr(base)) {

		spin_lock_irqsave(&priv->trans->reg_lock, flags);

		ret = iwl_grab_nic_access_silent(priv->trans);

		if (likely(ret == 0)) {

		if (iwl_trans_grab_nic_access(priv->trans, true)) {

			iwl_write32(priv->trans, HBUS_TARG_MEM_RADDR, base);

			status = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);

			iwl_release_nic_access(priv->trans);

			iwl_trans_release_nic_access(priv->trans);

			ret = 0;

		}

		spin_unlock_irqrestore(&priv->trans->reg_lock, flags);
@@ -479,7 +479,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) 
			}



			if (priv->wowlan_sram)

				_iwl_read_targ_mem_dwords(

				iwl_trans_read_mem(

				      priv->trans, 0x800000,

				      priv->wowlan_sram,

				      img->sec[IWL_UCODE_SECTION_DATA].len / 4);

drivers/net/wireless/iwlwifi/dvm/main.c

+11 −10
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base, 


	/* Make sure device is powered up for SRAM reads */

	spin_lock_irqsave(&priv->trans->reg_lock, reg_flags);

	if (unlikely(!iwl_grab_nic_access(priv->trans))) {

	if (!iwl_trans_grab_nic_access(priv->trans, false)) {

		spin_unlock_irqrestore(&priv->trans->reg_lock, reg_flags);

		return;

	}
@@ -388,7 +388,7 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base, 
		}

	}

	/* Allow device to power down */

	iwl_release_nic_access(priv->trans);

	iwl_trans_release_nic_access(priv->trans);

	spin_unlock_irqrestore(&priv->trans->reg_lock, reg_flags);

}
@@ -408,7 +408,8 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv) 


	base = priv->device_pointers.log_event_table;

	if (iwlagn_hw_valid_rtc_data_addr(base)) {

		iwl_read_targ_mem_bytes(priv->trans, base, &read, sizeof(read));

		iwl_trans_read_mem_bytes(priv->trans, base,

					 &read, sizeof(read));

		capacity = read.capacity;

		mode = read.mode;

		num_wraps = read.wrap_counter;
@@ -1627,7 +1628,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv) 
	}



	/*TODO: Update dbgfs with ISR error stats obtained below */

	iwl_read_targ_mem_bytes(trans, base, &table, sizeof(table));

	iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table));



	if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {

		IWL_ERR(trans, "Start IWL Error Log Dump:\n");
@@ -1717,7 +1718,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx, 


	/* Make sure device is powered up for SRAM reads */

	spin_lock_irqsave(&trans->reg_lock, reg_flags);

	if (unlikely(!iwl_grab_nic_access(trans)))

	if (!iwl_trans_grab_nic_access(trans, false))

		goto out_unlock;



	/* Set starting address; reads will auto-increment */
@@ -1756,7 +1757,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx, 
	}



	/* Allow device to power down */

	iwl_release_nic_access(trans);

	iwl_trans_release_nic_access(trans);

out_unlock:

	spin_unlock_irqrestore(&trans->reg_lock, reg_flags);

	return pos;
@@ -1835,10 +1836,10 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, 
	}



	/* event log header */

	capacity = iwl_read_targ_mem(trans, base);

	mode = iwl_read_targ_mem(trans, base + (1 * sizeof(u32)));

	num_wraps = iwl_read_targ_mem(trans, base + (2 * sizeof(u32)));

	next_entry = iwl_read_targ_mem(trans, base + (3 * sizeof(u32)));

	capacity = iwl_trans_read_mem32(trans, base);

	mode = iwl_trans_read_mem32(trans, base + (1 * sizeof(u32)));

	num_wraps = iwl_trans_read_mem32(trans, base + (2 * sizeof(u32)));

	next_entry = iwl_trans_read_mem32(trans, base + (3 * sizeof(u32)));



	if (capacity > logsize) {

		IWL_ERR(priv, "Log capacity %d is bogus, limit to %d "