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

Commit 08079a49 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: move hw_rev to transport layer 



The HW revision is now read by the transport layer in its allocation.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 99673ee5

drivers/net/wireless/iwlwifi/iwl-agn.c

+2 −11
Original line number Diff line number Diff line
@@ -1691,13 +1691,6 @@ static void iwl_uninit_drv(struct iwl_priv *priv) 
#endif

}







static u32 iwl_hw_detect(struct iwl_priv *priv)

{

	return iwl_read32(trans(priv), CSR_HW_REV);

}



/* Size of one Rx buffer in host DRAM */

#define IWL_RX_BUF_SIZE_4K (4 * 1024)

#define IWL_RX_BUF_SIZE_8K (8 * 1024)
@@ -1769,7 +1762,6 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
	struct iwl_priv *priv;

	struct ieee80211_hw *hw;

	u16 num_mac;

	u32 hw_rev;



	/************************

	 * 1. Allocating HW data
@@ -1818,9 +1810,8 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
	/***********************

	 * 3. Read REV register

	 ***********************/

	hw_rev = iwl_hw_detect(priv);

	IWL_INFO(priv, "Detected %s, REV=0x%X\n",

		cfg(priv)->name, hw_rev);

		cfg(priv)->name, trans(priv)->hw_rev);



	err = iwl_trans_start_hw(trans(priv));

	if (err)
@@ -1830,7 +1821,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
	 * 4. Read EEPROM

	 *****************/

	/* Read the EEPROM */

	err = iwl_eeprom_init(priv, hw_rev);

	err = iwl_eeprom_init(priv, trans(priv)->hw_rev);

	/* Reset chip to save power until we load uCode during "up". */

	iwl_trans_stop_hw(trans(priv));

	if (err) {

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+1 −0
Original line number Diff line number Diff line
@@ -2317,6 +2317,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd, 
	trans->dev = &pdev->dev;

	trans->irq = pdev->irq;

	trans_pcie->pci_dev = pdev;

	trans->hw_rev = iwl_read32(trans, CSR_HW_REV);

	trans->hw_id = (pdev->device << 16) + pdev->subsystem_device;

	snprintf(trans->hw_id_str, sizeof(trans->hw_id_str),

		 "PCI ID: 0x%04X:0x%04X", pdev->device, pdev->subsystem_device);

drivers/net/wireless/iwlwifi/iwl-trans.h

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ struct iwl_trans { 


	struct device *dev;

	unsigned int irq;

	u32 hw_rev;

	u32 hw_id;

	char hw_id_str[52];