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

Commit 0513c083 authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Luca Coelho
Browse files

iwlwifi: add csr configuration for 6300 devices 



Recently we have switched the csr addresses and values configuration
from a single configuration to all devices to a per-device configuration.
Doing that, the configuration for 6300 devices wasn't set.
This missing definition introduced a kernel panic once trying to access
the csr's.

Add the missing 6300 csr configuration.

While at it, add a checker that the csr values were indeed
configured, and bail out more gracefully if not.

Fixes: a8cbb46f ("iwlwifi: allow different csr flags for different device families")
Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 06895b16

drivers/net/wireless/intel/iwlwifi/cfg/6000.c

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ const struct iwl_cfg iwl6000_3agn_cfg = { 
	.eeprom_params = &iwl6000_eeprom_params,

	.ht_params = &iwl6000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.csr = &iwl_csr_v1,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

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

+3 −0
Original line number Diff line number Diff line
@@ -836,6 +836,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct iwl_trans *iwl_trans;

	int ret;



	if (WARN_ONCE(!cfg->csr, "CSR addresses aren't configured\n"))

		return -EINVAL;



	iwl_trans = iwl_trans_pcie_alloc(pdev, ent, cfg);

	if (IS_ERR(iwl_trans))

		return PTR_ERR(iwl_trans);