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

Commit 02796d77 authored by Shanyu Zhao's avatar Shanyu Zhao Committed by Wey-Yi Guy
Browse files

iwlagn: set CSR register for 6050g2 devices 



For 6050g2 devices driver needs to set a special bit to CSR register
so that uCode can do things correctly in calibration routines.

Signed-off-by: default avatarShanyu Zhao <shanyu.zhao@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 6b5ce501

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

+23 −1
Original line number Original line Diff line number Diff line
@@ -91,6 +91,16 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv) 
				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

}

}





static void iwl6050g2_additional_nic_config(struct iwl_priv *priv)

{

	/* Indicate calibration version to uCode. */

	if (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

	iwl_set_bit(priv, CSR_GP_DRIVER_REG,

		    CSR_GP_DRIVER_REG_BIT_6050_1x2);

}



/* NIC configuration for 6000 series */

/* NIC configuration for 6000 series */

static void iwl6000_nic_config(struct iwl_priv *priv)

static void iwl6000_nic_config(struct iwl_priv *priv)

{

{
@@ -422,6 +432,10 @@ static struct iwl_nic_ops iwl6050_nic_ops = { 
	.additional_nic_config = &iwl6050_additional_nic_config,

	.additional_nic_config = &iwl6050_additional_nic_config,

};

};





static struct iwl_nic_ops iwl6050g2_nic_ops = {

	.additional_nic_config = &iwl6050g2_additional_nic_config,

};



static const struct iwl_ops iwl6000_ops = {

static const struct iwl_ops iwl6000_ops = {

	.lib = &iwl6000_lib,

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.hcmd = &iwlagn_hcmd,
@@ -437,6 +451,14 @@ static const struct iwl_ops iwl6050_ops = { 
	.nic = &iwl6050_nic_ops,

	.nic = &iwl6050_nic_ops,

};

};





static const struct iwl_ops iwl6050g2_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.nic = &iwl6050g2_nic_ops,

};



static const struct iwl_ops iwl6000g2b_ops = {

static const struct iwl_ops iwl6000g2b_ops = {

	.lib = &iwl6000g2b_lib,

	.lib = &iwl6000g2b_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.hcmd = &iwlagn_bt_hcmd,
@@ -958,7 +980,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = { 
	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl6050_ops,

	.ops = &iwl6050g2_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050G2_EEPROM_VERSION,

	.eeprom_ver = EEPROM_6050G2_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6050G2_TX_POWER_VERSION,

	.eeprom_calib_ver = EEPROM_6050G2_TX_POWER_VERSION,

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -372,6 +372,7 @@ 
#define CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_HYB	    (0x00000001)

#define CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_HYB	    (0x00000001)

#define CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA	    (0x00000002)

#define CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA	    (0x00000002)

#define CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6	    (0x00000004)

#define CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6	    (0x00000004)

#define CSR_GP_DRIVER_REG_BIT_6050_1x2		    (0x00000008)





/* GIO Chicken Bits (PCI Express bus link power management) */

/* GIO Chicken Bits (PCI Express bus link power management) */

#define CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX  (0x00800000)

#define CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX  (0x00800000)