rt2800: move rf init calibration code

[~andy/linux] / drivers / net / wireless / rt2x00 / rt2800lib.c

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index f08a0424fe4d12bba4b7145ce793009d040850c4..6e9ca3e00f1d2a371d41a0218db5966eee2da975 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -3147,7 +3147,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
 
 void rt2800_gain_calibration(struct rt2x00_dev *rt2x00dev)
 {
-       rt2800_config_txpower(rt2x00dev, rt2x00dev->hw->conf.channel,
+       rt2800_config_txpower(rt2x00dev, rt2x00dev->hw->conf.chandef.chan,
                              rt2x00dev->tx_power);
 }
 EXPORT_SYMBOL_GPL(rt2800_gain_calibration);
@@ -3282,11 +3282,11 @@ void rt2800_config(struct rt2x00_dev *rt2x00dev,
        if (flags & IEEE80211_CONF_CHANGE_CHANNEL) {
                rt2800_config_channel(rt2x00dev, libconf->conf,
                                      &libconf->rf, &libconf->channel);
-               rt2800_config_txpower(rt2x00dev, libconf->conf->channel,
+               rt2800_config_txpower(rt2x00dev, libconf->conf->chandef.chan,
                                      libconf->conf->power_level);
        }
        if (flags & IEEE80211_CONF_CHANGE_POWER)
-               rt2800_config_txpower(rt2x00dev, libconf->conf->channel,
+               rt2800_config_txpower(rt2x00dev, libconf->conf->chandef.chan,
                                      libconf->conf->power_level);
        if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS)
                rt2800_config_retry_limit(rt2x00dev, libconf);
@@ -4396,8 +4396,52 @@ static u8 rt2800_init_rx_filter(struct rt2x00_dev *rt2x00dev,
        return rfcsr24;
 }
 
+static void rt2800_rf_init_calibration(struct rt2x00_dev *rt2x00dev,
+                                      const unsigned int rf_reg)
+{
+       u8 rfcsr;
+
+       rt2800_rfcsr_read(rt2x00dev, rf_reg, &rfcsr);
+       rt2x00_set_field8(&rfcsr, FIELD8(0x80), 1);
+       rt2800_rfcsr_write(rt2x00dev, rf_reg, rfcsr);
+       msleep(1);
+       rt2x00_set_field8(&rfcsr, FIELD8(0x80), 0);
+       rt2800_rfcsr_write(rt2x00dev, rf_reg, rfcsr);
+}
+
+static void rt2800_normal_mode_setup_5xxx(struct rt2x00_dev *rt2x00dev)
+{
+       u8 reg;
+       u16 eeprom;
+
+       /*  Turn off unused DAC1 and ADC1 to reduce power consumption */
+       rt2800_bbp_read(rt2x00dev, 138, &reg);
+       rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
+       if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
+               rt2x00_set_field8(&reg, BBP138_RX_ADC1, 0);
+       if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
+               rt2x00_set_field8(&reg, BBP138_TX_DAC1, 1);
+       rt2800_bbp_write(rt2x00dev, 138, reg);
+
+       rt2800_rfcsr_read(rt2x00dev, 38, &reg);
+       rt2x00_set_field8(&reg, RFCSR38_RX_LO1_EN, 0);
+       rt2800_rfcsr_write(rt2x00dev, 38, reg);
+
+       rt2800_rfcsr_read(rt2x00dev, 39, &reg);
+       rt2x00_set_field8(&reg, RFCSR39_RX_LO2_EN, 0);
+       rt2800_rfcsr_write(rt2x00dev, 39, reg);
+
+       rt2800_bbp4_mac_if_ctrl(rt2x00dev);
+
+       rt2800_rfcsr_read(rt2x00dev, 30, &reg);
+       rt2x00_set_field8(&reg, RFCSR30_RX_VCM, 2);
+       rt2800_rfcsr_write(rt2x00dev, 30, reg);
+}
+
 static void rt2800_init_rfcsr_305x_soc(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_rf_init_calibration(rt2x00dev, 30);
+
        rt2800_rfcsr_write(rt2x00dev, 0, 0x50);
        rt2800_rfcsr_write(rt2x00dev, 1, 0x01);
        rt2800_rfcsr_write(rt2x00dev, 2, 0xf7);
@@ -4434,6 +4478,9 @@ static void rt2800_init_rfcsr_305x_soc(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_rfcsr_30xx(struct rt2x00_dev *rt2x00dev)
 {
+       /* XXX vendor driver do this only for 3070 */
+       rt2800_rf_init_calibration(rt2x00dev, 30);
+
        rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
        rt2800_rfcsr_write(rt2x00dev, 5, 0x03);
        rt2800_rfcsr_write(rt2x00dev, 6, 0x02);
@@ -4457,6 +4504,8 @@ static void rt2800_init_rfcsr_30xx(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_rfcsr_3290(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_rf_init_calibration(rt2x00dev, 2);
+
        rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
        rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
        rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
@@ -4507,6 +4556,8 @@ static void rt2800_init_rfcsr_3290(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_rf_init_calibration(rt2x00dev, 30);
+
        rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
        rt2800_rfcsr_write(rt2x00dev, 1, 0x23);
        rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
@@ -4574,6 +4625,8 @@ static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_rfcsr_3390(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_rf_init_calibration(rt2x00dev, 30);
+
        rt2800_rfcsr_write(rt2x00dev, 0, 0xa0);
        rt2800_rfcsr_write(rt2x00dev, 1, 0xe1);
        rt2800_rfcsr_write(rt2x00dev, 2, 0xf1);
@@ -4610,6 +4663,8 @@ static void rt2800_init_rfcsr_3390(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_rfcsr_3572(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_rf_init_calibration(rt2x00dev, 30);
+
        rt2800_rfcsr_write(rt2x00dev, 0, 0x70);
        rt2800_rfcsr_write(rt2x00dev, 1, 0x81);
        rt2800_rfcsr_write(rt2x00dev, 2, 0xf1);
@@ -4645,6 +4700,8 @@ static void rt2800_init_rfcsr_3572(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_rf_init_calibration(rt2x00dev, 2);
+
        rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
        rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
        rt2800_rfcsr_write(rt2x00dev, 3, 0x88);
@@ -4725,10 +4782,14 @@ static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
                rt2800_rfcsr_write(rt2x00dev, 61, 0xdd);
        rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
        rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
+
+       rt2800_normal_mode_setup_5xxx(rt2x00dev);
 }
 
 static void rt2800_init_rfcsr_5392(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_rf_init_calibration(rt2x00dev, 2);
+
        rt2800_rfcsr_write(rt2x00dev, 1, 0x17);
        rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
        rt2800_rfcsr_write(rt2x00dev, 3, 0x88);
@@ -4788,12 +4849,13 @@ static void rt2800_init_rfcsr_5392(struct rt2x00_dev *rt2x00dev)
        rt2800_rfcsr_write(rt2x00dev, 61, 0x91);
        rt2800_rfcsr_write(rt2x00dev, 62, 0x39);
        rt2800_rfcsr_write(rt2x00dev, 63, 0x07);
+
+       rt2800_normal_mode_setup_5xxx(rt2x00dev);
 }
 
 static void rt2800_init_rfcsr_5592(struct rt2x00_dev *rt2x00dev)
 {
-       u8 reg;
-       u16 eeprom;
+       rt2800_rf_init_calibration(rt2x00dev, 30);
 
        rt2800_rfcsr_write(rt2x00dev, 1, 0x3F);
        rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
@@ -4823,34 +4885,11 @@ static void rt2800_init_rfcsr_5592(struct rt2x00_dev *rt2x00dev)
 
        rt2800_adjust_freq_offset(rt2x00dev);
 
-       rt2800_bbp_read(rt2x00dev, 138, &reg);
-
-       /*  Turn off unused DAC1 and ADC1 to reduce power consumption */
-       rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-       if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
-               rt2x00_set_field8(&reg, BBP138_RX_ADC1, 0);
-       if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
-               rt2x00_set_field8(&reg, BBP138_TX_DAC1, 1);
-
-       rt2800_bbp_write(rt2x00dev, 138, reg);
-
        /* Enable DC filter */
        if (rt2x00_rt_rev_gte(rt2x00dev, RT5592, REV_RT5592C))
                rt2800_bbp_write(rt2x00dev, 103, 0xc0);
 
-       rt2800_rfcsr_read(rt2x00dev, 38, &reg);
-       rt2x00_set_field8(&reg, RFCSR38_RX_LO1_EN, 0);
-       rt2800_rfcsr_write(rt2x00dev, 38, reg);
-
-       rt2800_rfcsr_read(rt2x00dev, 39, &reg);
-       rt2x00_set_field8(&reg, RFCSR39_RX_LO2_EN, 0);
-       rt2800_rfcsr_write(rt2x00dev, 39, reg);
-
-       rt2800_bbp4_mac_if_ctrl(rt2x00dev);
-
-       rt2800_rfcsr_read(rt2x00dev, 30, &reg);
-       rt2x00_set_field8(&reg, RFCSR30_RX_VCM, 2);
-       rt2800_rfcsr_write(rt2x00dev, 30, reg);
+       rt2800_normal_mode_setup_5xxx(rt2x00dev);
 }
 
 static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
@@ -4875,28 +4914,6 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
            !rt2800_is_305x_soc(rt2x00dev))
                return 0;
 
-       /*
-        * Init RF calibration.
-        */
-
-       if (rt2x00_rt(rt2x00dev, RT3290) ||
-           rt2x00_rt(rt2x00dev, RT5390) ||
-           rt2x00_rt(rt2x00dev, RT5392)) {
-               rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
-               rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);
-               rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
-               msleep(1);
-               rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 0);
-               rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
-       } else {
-               rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-               rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
-               rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-               msleep(1);
-               rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 0);
-               rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-       }
-
        if (rt2800_is_305x_soc(rt2x00dev)) {
                rt2800_init_rfcsr_305x_soc(rt2x00dev);
                return 0;
@@ -5036,6 +5053,8 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
 
        if (!rt2x00_rt(rt2x00dev, RT5390) &&
            !rt2x00_rt(rt2x00dev, RT5392)) {
+               u8 min_gain = rt2x00_rt(rt2x00dev, RT3070) ? 1 : 2;
+
                rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
                rt2x00_set_field8(&rfcsr, RFCSR17_TX_LO1_EN, 0);
                if (rt2x00_rt(rt2x00dev, RT3070) ||
@@ -5046,22 +5065,21 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
                                      &rt2x00dev->cap_flags))
                                rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);
                }
-               rt2x00_set_field8(&rfcsr, RFCSR17_TXMIXER_GAIN,
-                                 drv_data->txmixer_gain_24g);
+               if (drv_data->txmixer_gain_24g >= min_gain) {
+                       rt2x00_set_field8(&rfcsr, RFCSR17_TXMIXER_GAIN,
+                                         drv_data->txmixer_gain_24g);
+               }
                rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
        }
 
-       if (rt2x00_rt(rt2x00dev, RT3090) ||
-           rt2x00_rt(rt2x00dev, RT5592)) {
-               rt2800_bbp_read(rt2x00dev, 138, &bbp);
-
+       if (rt2x00_rt(rt2x00dev, RT3090)) {
                /*  Turn off unused DAC1 and ADC1 to reduce power consumption */
+               rt2800_bbp_read(rt2x00dev, 138, &bbp);
                rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
                if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
                        rt2x00_set_field8(&bbp, BBP138_RX_ADC1, 0);
                if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
                        rt2x00_set_field8(&bbp, BBP138_TX_DAC1, 1);
-
                rt2800_bbp_write(rt2x00dev, 138, bbp);
        }
 
@@ -5107,22 +5125,6 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
                rt2800_rfcsr_write(rt2x00dev, 29, rfcsr);
        }
 
-       if (rt2x00_rt(rt2x00dev, RT5390) ||
-           rt2x00_rt(rt2x00dev, RT5392) ||
-           rt2x00_rt(rt2x00dev, RT5592)) {
-               rt2800_rfcsr_read(rt2x00dev, 38, &rfcsr);
-               rt2x00_set_field8(&rfcsr, RFCSR38_RX_LO1_EN, 0);
-               rt2800_rfcsr_write(rt2x00dev, 38, rfcsr);
-
-               rt2800_rfcsr_read(rt2x00dev, 39, &rfcsr);
-               rt2x00_set_field8(&rfcsr, RFCSR39_RX_LO2_EN, 0);
-               rt2800_rfcsr_write(rt2x00dev, 39, rfcsr);
-
-               rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-               rt2x00_set_field8(&rfcsr, RFCSR30_RX_VCM, 2);
-               rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-       }
-
        return 0;
 }
 
@@ -5431,9 +5433,9 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
 
 static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
 {
-       u32 reg;
        u16 value;
        u16 eeprom;
+       u16 rf;
 
        /*
         * Read EEPROM word for configuration.
@@ -5445,42 +5447,14 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
         * RT28xx/RT30xx: defined in "EEPROM_NIC_CONF0_RF_TYPE" field
         * RT53xx: defined in "EEPROM_CHIP_ID" field
         */
-       if (rt2x00_rt(rt2x00dev, RT3290))
-               rt2800_register_read(rt2x00dev, MAC_CSR0_3290, &reg);
-       else
-               rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
-
-       if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT3290 ||
-           rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||
-           rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)
-               rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &value);
+       if (rt2x00_rt(rt2x00dev, RT3290) ||
+           rt2x00_rt(rt2x00dev, RT5390) ||
+           rt2x00_rt(rt2x00dev, RT5392))
+               rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
        else
-               value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
-
-       rt2x00_set_chip(rt2x00dev, rt2x00_get_field32(reg, MAC_CSR0_CHIPSET),
-                       value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
-
-       switch (rt2x00dev->chip.rt) {
-       case RT2860:
-       case RT2872:
-       case RT2883:
-       case RT3070:
-       case RT3071:
-       case RT3090:
-       case RT3290:
-       case RT3352:
-       case RT3390:
-       case RT3572:
-       case RT5390:
-       case RT5392:
-       case RT5592:
-               break;
-       default:
-               ERROR(rt2x00dev, "Invalid RT chipset 0x%04x detected.\n", rt2x00dev->chip.rt);
-               return -ENODEV;
-       }
+               rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
 
-       switch (rt2x00dev->chip.rf) {
+       switch (rf) {
        case RF2820:
        case RF2850:
        case RF2720:
@@ -5501,11 +5475,12 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
        case RF5592:
                break;
        default:
-               ERROR(rt2x00dev, "Invalid RF chipset 0x%04x detected.\n",
-                     rt2x00dev->chip.rf);
+               ERROR(rt2x00dev, "Invalid RF chipset 0x%04x detected.\n", rf);
                return -ENODEV;
        }
 
+       rt2x00_set_rf(rt2x00dev, rf);
+
        /*
         * Identify default antenna configuration.
         */
@@ -6059,11 +6034,56 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
        return 0;
 }
 
+static int rt2800_probe_rt(struct rt2x00_dev *rt2x00dev)
+{
+       u32 reg;
+       u32 rt;
+       u32 rev;
+
+       if (rt2x00_rt(rt2x00dev, RT3290))
+               rt2800_register_read(rt2x00dev, MAC_CSR0_3290, &reg);
+       else
+               rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
+
+       rt = rt2x00_get_field32(reg, MAC_CSR0_CHIPSET);
+       rev = rt2x00_get_field32(reg, MAC_CSR0_REVISION);
+
+       switch (rt) {
+       case RT2860:
+       case RT2872:
+       case RT2883:
+       case RT3070:
+       case RT3071:
+       case RT3090:
+       case RT3290:
+       case RT3352:
+       case RT3390:
+       case RT3572:
+       case RT5390:
+       case RT5392:
+       case RT5592:
+               break;
+       default:
+               ERROR(rt2x00dev,
+                     "Invalid RT chipset 0x%04x, rev %04x detected.\n",
+                     rt, rev);
+               return -ENODEV;
+       }
+
+       rt2x00_set_rt(rt2x00dev, rt, rev);
+
+       return 0;
+}
+
 int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
 {
        int retval;
        u32 reg;
 
+       retval = rt2800_probe_rt(rt2x00dev);
+       if (retval)
+               return retval;
+
        /*
         * Allocate eeprom data.
         */
@@ -6322,7 +6342,7 @@ int rt2800_get_survey(struct ieee80211_hw *hw, int idx,
        if (idx != 0)
                return -ENOENT;
 
-       survey->channel = conf->channel;
+       survey->channel = conf->chandef.chan;
 
        rt2800_register_read(rt2x00dev, CH_IDLE_STA, &idle);
        rt2800_register_read(rt2x00dev, CH_BUSY_STA, &busy);