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

Commit c5bf4fa1 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: pcie: initialize debug_rfkill to -1 



This will let us introduce a mechanism to start with rfkill
faked, and put 0 here to override it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 14cf9bc6

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ struct iwl_trans_pcie { 
	int ict_index;

	bool use_ict;

	bool is_down, opmode_down;

	bool debug_rfkill;

	s8 debug_rfkill;

	struct isr_statistics isr_stats;



	spinlock_t irq_lock;
@@ -982,7 +982,7 @@ static inline bool iwl_is_rfkill_set(struct iwl_trans *trans) 


	lockdep_assert_held(&trans_pcie->mutex);



	if (trans_pcie->debug_rfkill)

	if (trans_pcie->debug_rfkill == 1)

		return true;



	return !(iwl_read32(trans, CSR_GP_CNTRL) &

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

+6 −5
Original line number Diff line number Diff line
@@ -2688,16 +2688,17 @@ static ssize_t iwl_dbgfs_rfkill_write(struct file *file, 
{

	struct iwl_trans *trans = file->private_data;

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	bool old = trans_pcie->debug_rfkill;

	bool new_value;

	int ret;



	ret = kstrtobool_from_user(user_buf, count, &trans_pcie->debug_rfkill);

	ret = kstrtobool_from_user(user_buf, count, &new_value);

	if (ret)

		return ret;

	if (old == trans_pcie->debug_rfkill)

	if (new_value == trans_pcie->debug_rfkill)

		return count;

	IWL_WARN(trans, "changing debug rfkill %d->%d\n",

		 old, trans_pcie->debug_rfkill);

		 trans_pcie->debug_rfkill, new_value);

	trans_pcie->debug_rfkill = new_value;

	iwl_pcie_handle_rfkill_irq(trans);



	return count;
@@ -3421,7 +3422,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
		ret = -ENOMEM;

		goto out_no_pci;

	}



	trans_pcie->debug_rfkill = -1;



	if (!cfg->base_params->pcie_l1_allowed) {

		/*