package/ar7-atm/patches-D7.05.01.00/160-module-params.patch

   1 --- a/tn7atm.c
   2 +++ b/tn7atm.c
   3 @@ -95,6 +95,146 @@
   4  MODULE_LICENSE("GPL");
   5  MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver");
   6  MODULE_AUTHOR ("Zhicheng Tang");
   7 +
   8 +int mp_sar_ipacemax = -1;
   9 +module_param_named(ipacemax, mp_sar_ipacemax, int, 0);
  10 +MODULE_PARM_DESC(ipacemax, "Interrupt pacing");
  11 +
  12 +char *mp_macc = NULL;
  13 +module_param_named(macc, mp_macc, charp, 0);
  14 +MODULE_PARM_DESC(macc, "MAC address");
  15 +
  16 +int mp_dsp_noboost = -1;
  17 +module_param_named(dsp_noboost, mp_dsp_noboost, int, 0);
  18 +MODULE_PARM_DESC(dsp_noboost, "Suppress DSP frequency boost");
  19 +
  20 +int mp_dsp_freq = -1;
  21 +module_param_named(dsp_freq, mp_dsp_freq, int, 0);
  22 +MODULE_PARM_DESC(dsp_freq, "Frequency to boost the DSP to");
  23 +
  24 +char *mp_featctl0 = NULL;
  25 +module_param_named(featctl0, mp_featctl0, charp, 0);
  26 +MODULE_PARM_DESC(featctl0, "DSL feature control 0");
  27 +
  28 +char *mp_featctl1 = NULL;
  29 +module_param_named(featctl1, mp_featctl1, charp, 0);
  30 +MODULE_PARM_DESC(featctl1, "DSL feature control 1");
  31 +
  32 +char *mp_phyctl0 = NULL;
  33 +module_param_named(phyctl0, mp_phyctl0, charp, 0);
  34 +MODULE_PARM_DESC(phyctl0, "DSL PHY control 0");
  35 +
  36 +char *mp_phyctl1 = NULL;
  37 +module_param_named(phyctl1, mp_phyctl1, charp, 0);
  38 +MODULE_PARM_DESC(phyctl1, "DSL PHY control 1");
  39 +
  40 +int mp_turbodsl = -1;
  41 +module_param_named(turbodsl, mp_turbodsl, int, 0);
  42 +MODULE_PARM_DESC(turbodsl, "Enable TurboDSL");
  43 +
  44 +int mp_sar_rxbuf = -1;
  45 +module_param_named(sar_rxbuf, mp_sar_rxbuf, int, 0);
  46 +MODULE_PARM_DESC(sar_rxbuf, "SAR RxBuf size");
  47 +
  48 +int mp_sar_rxmax = -1;
  49 +module_param_named(sar_rxmax, mp_sar_rxmax, int, 0);
  50 +MODULE_PARM_DESC(sar_rxmax, "SAR RxMax size");
  51 +
  52 +int mp_sar_txbuf = -1;
  53 +module_param_named(sar_txbuf, mp_sar_txbuf, int, 0);
  54 +MODULE_PARM_DESC(sar_txbuf, "SAR TxBuf size");
  55 +
  56 +int mp_sar_txmax = -1;
  57 +module_param_named(sar_txmax, mp_sar_txmax, int, 0);
  58 +MODULE_PARM_DESC(sar_txmax, "SAR TxMax size");
  59 +
  60 +char *mp_modulation = NULL;
  61 +module_param_named(modulation, mp_modulation, charp, 0);
  62 +MODULE_PARM_DESC(modulation, "Modulation");
  63 +
  64 +int mp_fine_gain_control = -1;
  65 +module_param_named(fine_gain_control, mp_fine_gain_control, int, 0);
  66 +MODULE_PARM_DESC(fine_gain_control, "Fine gain control");
  67 +
  68 +int mp_fine_gain_value = -1;
  69 +module_param_named(fine_gain_value, mp_fine_gain_value, int, 0);
  70 +MODULE_PARM_DESC(fine_gain_value, "Fine gain value");
  71 +
  72 +int mp_enable_margin_retrain = -1;
  73 +module_param_named(enable_margin_retrain, mp_enable_margin_retrain, int, 0);
  74 +MODULE_PARM_DESC(enable_margin_retrain, "Enable margin retrain");
  75 +
  76 +int mp_margin_threshold = -1;
  77 +module_param_named(margin_threshold, mp_margin_threshold, int, 0);
  78 +MODULE_PARM_DESC(margin_threshold, "Margin retrain treshold");
  79 +
  80 +int mp_enable_rate_adapt = -1;
  81 +module_param_named(enable_rate_adapt, mp_enable_rate_adapt, int, 0);
  82 +MODULE_PARM_DESC(enable_rate_adapt, "Enable rate adaption");
  83 +
  84 +int mp_powercutback = -1;
  85 +module_param_named(powercutback, mp_powercutback, int, 0);
  86 +MODULE_PARM_DESC(powercutback, "Enable / disable powercutback");
  87 +
  88 +int mp_trellis = -1;
  89 +module_param_named(trellis, mp_trellis, int, 0);
  90 +MODULE_PARM_DESC(trellis, "Enable / disable trellis coding");
  91 +
  92 +int mp_bitswap = -1;
  93 +module_param_named(bitswap, mp_bitswap, int, 0);
  94 +MODULE_PARM_DESC(bitswap, "Enable / disable bitswap");
  95 +
  96 +int mp_maximum_bits_per_carrier = -1;
  97 +module_param_named(maximum_bits_per_carrier, mp_maximum_bits_per_carrier, int, 0);
  98 +MODULE_PARM_DESC(maximum_bits_per_carrier, "Maximum bits per carrier");
  99 +
 100 +int mp_maximum_interleave_depth = -1;
 101 +module_param_named(maximum_interleave_depth, mp_maximum_interleave_depth, int, 0);
 102 +MODULE_PARM_DESC(maximum_interleave_depth, "Maximum interleave depth");
 103 +
 104 +int mp_pair_selection = -1;
 105 +module_param_named(pair_selection, mp_pair_selection, int, 0);
 106 +MODULE_PARM_DESC(pair_selection, "Pair selection");
 107 +
 108 +int mp_dgas_polarity = -1;
 109 +module_param_named(dgas_polarity, mp_dgas_polarity, int, 0);
 110 +MODULE_PARM_DESC(dgas_polarity, "DGAS polarity");
 111 +
 112 +int mp_los_alarm = -1;
 113 +module_param_named(los_alarm, mp_los_alarm, int, 0);
 114 +MODULE_PARM_DESC(los_alarm, "LOS alarm");
 115 +
 116 +char *mp_eoc_vendor_id = NULL;
 117 +module_param_named(eoc_vendor_id, mp_eoc_vendor_id, charp, 0);
 118 +MODULE_PARM_DESC(eoc_vendor_id, "EOC vendor id");
 119 +
 120 +int mp_eoc_vendor_revision = -1;
 121 +module_param_named(eoc_vendor_revision, mp_eoc_vendor_revision, int, 0);
 122 +MODULE_PARM_DESC(eoc_vendor_revision, "EOC vendor revision");
 123 +
 124 +char *mp_eoc_vendor_serialnum = NULL;
 125 +module_param_named(eoc_vendor_serialnum, mp_eoc_vendor_serialnum, charp, 0);
 126 +MODULE_PARM_DESC(eoc_vendor_serialnum, "EOC vendor serial number");
 127 +
 128 +char *mp_invntry_vernum = NULL;
 129 +module_param_named(invntry_vernum, mp_invntry_vernum, charp, 0);
 130 +MODULE_PARM_DESC(invntry_vernum, "Inventory revision number");
 131 +
 132 +int mp_dsl_bit_tmode = -1;
 133 +module_param_named(dsl_bit_tmode, mp_dsl_bit_tmode, int, 0);
 134 +MODULE_PARM_DESC(dsl_bit_tmode, "DSL bit training mode");
 135 +
 136 +int mp_high_precision = -1;
 137 +module_param_named(high_precision, mp_high_precision, int, 0);
 138 +MODULE_PARM_DESC(high_precision, "High precision");
 139 +
 140 +int mp_autopvc_enable = -1;
 141 +module_param_named(autopvc_enable, mp_autopvc_enable, int, 0);
 142 +MODULE_PARM_DESC(autopvc_enable, "Enable / disable automatic PVC");
 143 +
 144 +int mp_oam_lb_timeout = -1;
 145 +module_param_named(oam_lb_timeout, mp_oam_lb_timeout, int, 0);
 146 +MODULE_PARM_DESC(oam_lb_timeout, "OAM LB timeout");
 147  #endif
 148
 149  #ifndef TRUE
 150 @@ -728,9 +868,9 @@ static int __init tn7atm_irq_request (st
 151     * interrupt pacing
 152     */
 153    ptr = prom_getenv ("sar_ipacemax");
 154 -  if (ptr)
 155 +  if (ptr || mp_sar_ipacemax != -1)
 156    {
 157 -    def_sar_inter_pace = os_atoi (ptr);
 158 +    def_sar_inter_pace = mp_sar_ipacemax == -1 ? os_atoi (ptr) : mp_sar_ipacemax;
 159    }
 160    /* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM,
 161                              def_sar_inter_pace); */
 162 @@ -880,7 +1020,7 @@ static int __init tn7atm_get_ESI (struct
 163    char esi_addr[ESI_LEN] = { 0x00, 0x00, 0x11, 0x22, 0x33, 0x44 };
 164    char *esiaddr_str = NULL;
 165
 166 -  esiaddr_str = prom_getenv ("macc");
 167 +  esiaddr_str = mp_macc ? mp_macc : prom_getenv ("maca");
 168
 169    if (!esiaddr_str)
 170    {
 171 @@ -2139,15 +2279,15 @@ static int tn7atm_autoDetectDspBoost (vo
 172  //UR8_MERGE_END   CQ10450*
 173
 174    cp = prom_getenv ("dsp_noboost");
 175 -  if (cp)
 176 +  if (cp || mp_dsp_noboost != -1)
 177    {
 178 -    dsp_noboost = os_atoi (cp);
 179 +    dsp_noboost = mp_dsp_noboost == -1 ? os_atoi (cp) : mp_dsp_noboost;
 180    }
 181
 182    cp = (char *) prom_getenv ("dsp_freq");
 183 -  if (cp)
 184 +  if (cp || mp_dsp_freq != -1)
 185    {
 186 -    dspfreq = os_atoi (cp);
 187 +    dspfreq = mp_dsp_freq == -1 ? os_atoi (cp) : mp_dsp_freq;
 188      if (dspfreq == 250)
 189      {
 190        boostDsp = 1;
 191 @@ -2396,15 +2536,17 @@ static int __init tn7atm_init (struct at
 192    // Inter-Op DSL phy Control
 193    // Note the setting of _dsl_Feature_0 and _dsl_Feature_1 must before
 194    // dslhal_api_dslStartup (in tn7dsl_init()).
 195 -  if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_0")) != NULL)
 196 +  if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_0")) != NULL || mp_featctl0 != NULL)
 197    {
 198 -    _dsl_Feature_0 = os_atoih (ptr);
 199 +    if (mp_featctl0 != NULL) ptr = mp_featctl0;
 200 +    _dsl_Feature_0 = os_atoh (ptr);
 201      _dsl_Feature_0_defined = 1;
 202    }
 203
 204 -  if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_1")) != NULL)
 205 +  if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_1")) != NULL || mp_featctl1 != NULL)
 206    {
 207 -    _dsl_Feature_1 = os_atoih (ptr);
 208 +    if (mp_featctl1 != NULL) ptr = mp_featctl1;
 209 +    _dsl_Feature_1 = os_atoh (ptr);
 210      _dsl_Feature_1_defined = 1;
 211    }
 212
 213 @@ -2412,15 +2554,17 @@ static int __init tn7atm_init (struct at
 214    // DSL phy Feature Control
 215    // Note the setting of _dsl_PhyControl_0 and _dsl_PhyControl_1 must before
 216    // dslhal_api_dslStartup (in tn7dsl_init()).
 217 -  if ((ptr = prom_getenv ("DSL_PHY_CNTL_0")) != NULL)
 218 +  if ((ptr = prom_getenv ("DSL_PHY_CNTL_0")) != NULL || mp_phyctl0 != NULL)
 219    {
 220 -    _dsl_PhyControl_0 = os_atoih (ptr);
 221 +    if (mp_phyctl0 != NULL) ptr = mp_phyctl0;
 222 +    _dsl_PhyControl_0 = os_atoh (ptr);
 223      _dsl_PhyControl_0_defined = 1;
 224    }
 225
 226 -  if ((ptr = prom_getenv ("DSL_PHY_CNTL_1")) != NULL)
 227 +  if ((ptr = prom_getenv ("DSL_PHY_CNTL_1")) != NULL || mp_phyctl1 != NULL)
 228    {
 229 -    _dsl_PhyControl_1 = os_atoih (ptr);
 230 +    if (mp_phyctl1 != NULL) ptr = mp_phyctl1;
 231 +    _dsl_PhyControl_1 = os_atoh (ptr);
 232      _dsl_PhyControl_1_defined = 1;
 233    }
 234
 235 @@ -2440,12 +2584,12 @@ static int __init tn7atm_init (struct at
 236    // read config for turbo dsl
 237
 238    ptr = prom_getenv ("TurboDSL");
 239 -  if (ptr)
 240 +  if (ptr || mp_turbodsl != -1)
 241    {
 242      #if 1 //[KT]
 243      bTurboDsl = os_atoi (ptr);
 244      #else
 245 -    priv->bTurboDsl = os_atoi (ptr);
 246 +    priv->bTurboDsl = mp_turbodsl == -1 ? os_atoi (ptr) : mp_turbodsl;
 247      #endif
 248    }
 249     else
 250 @@ -2459,33 +2603,33 @@ static int __init tn7atm_init (struct at
 251    priv->sarRxBuf = RX_BUFFER_NUM;
 252    ptr = NULL;
 253    ptr = prom_getenv ("SarRxBuf");
 254 -  if (ptr)
 255 +  if (ptr || mp_sar_rxbuf != -1)
 256    {
 257 -    priv->sarRxBuf = os_atoi (ptr);
 258 +    priv->sarRxBuf = mp_sar_rxbuf == -1 ? os_atoi (ptr) : mp_sar_rxbuf;
 259    }
 260
 261    priv->sarRxMax = RX_SERVICE_MAX;
 262    ptr = NULL;
 263    ptr = prom_getenv ("SarRxMax");
 264 -  if (ptr)
 265 +  if (ptr || mp_sar_rxmax != -1)
 266    {
 267 -    priv->sarRxMax = os_atoi (ptr);
 268 +    priv->sarRxMax = mp_sar_rxmax == -1 ? os_atoi (ptr) : mp_sar_rxmax;
 269    }
 270
 271    priv->sarTxBuf = TX_BUFFER_NUM;
 272    ptr = NULL;
 273    ptr = prom_getenv ("SarTxBuf");
 274 -  if (ptr)
 275 +  if (ptr || mp_sar_txbuf != -1)
 276    {
 277 -    priv->sarTxBuf = os_atoi (ptr);
 278 +    priv->sarTxBuf = mp_sar_txbuf == -1 ? os_atoi (ptr) : mp_sar_txbuf;
 279    }
 280
 281    priv->sarTxMax = TX_SERVICE_MAX;
 282    ptr = NULL;
 283    ptr = prom_getenv ("SarTxMax");
 284 -  if (ptr)
 285 +  if (ptr || mp_sar_txmax != -1)
 286    {
 287 -    priv->sarTxMax = os_atoi (ptr);
 288 +    priv->sarTxMax = mp_sar_txmax == -1 ? os_atoi (ptr) : mp_sar_txmax;
 289    }
 290
 291  #ifdef AR7_EFM
 292 --- a/tn7dsl.c
 293 +++ b/tn7dsl.c
 294 @@ -148,6 +148,27 @@
 295  #define NEW_TRAINING_VAL_T1413  128
 296  #define NEW_TRAINING_VAL_MMODE  255
 297
 298 +extern char *mp_modulation;
 299 +extern int mp_fine_gain_control;
 300 +extern int mp_fine_gain_value;
 301 +extern int mp_enable_margin_retrain;
 302 +extern int mp_margin_threshold;
 303 +extern int mp_enable_rate_adapt;
 304 +extern int mp_powercutback;
 305 +extern int mp_trellis;
 306 +extern int mp_bitswap;
 307 +extern int mp_maximum_bits_per_carrier;
 308 +extern int mp_maximum_interleave_depth;
 309 +extern int mp_pair_selection;
 310 +extern int mp_dgas_polarity;
 311 +extern int mp_los_alarm;
 312 +extern char *mp_eoc_vendor_id;
 313 +extern int mp_eoc_vendor_revision;
 314 +extern char *mp_eoc_vendor_serialnum;
 315 +extern char *mp_invntry_vernum;
 316 +extern int mp_dsl_bit_tmode;
 317 +extern int mp_high_precision;
 318 +
 319  int testflag1 = 0;
 320  extern int  __guDbgLevel;
 321  extern sar_stat_t sarStat;
 322 @@ -2933,24 +2954,24 @@ static int tn7dsl_set_dsl(void)
 323                                  (unsigned char *) &oamFeature, 4);
 324
 325    ptr = prom_getenv("DSL_FEATURE_CNTL_0");
 326 -  if(!ptr)
 327 -    prom_setenv("DSL_FEATURE_CNTL_0", "0x00004000");
 328 +  //if(!ptr)
 329 +    //prom_setenv("DSL_FEATURE_CNTL_0", "0x00004000");
 330
 331    ptr = prom_getenv("DSL_FEATURE_CNTL_1");
 332 -  if(!ptr)
 333 -       prom_setenv("DSL_FEATURE_CNTL_1", "0x00000000");
 334 +  //if(!ptr)
 335 +       //prom_setenv("DSL_FEATURE_CNTL_1", "0x00000000");
 336
 337    ptr = prom_getenv("DSL_PHY_CNTL_0");
 338 -  if(!ptr)
 339 -       prom_setenv("DSL_PHY_CNTL_0", "0x00000400");
 340 +  //if(!ptr)
 341 +       //prom_setenv("DSL_PHY_CNTL_0", "0x00000400");
 342
 343    ptr = prom_getenv("enable_margin_retrain");
 344 -  if(!ptr)
 345 -       prom_setenv("enable_margin_retrain", "0");
 346 +  //if(!ptr)
 347 +       //prom_setenv("enable_margin_retrain", "0");
 348
 349    ptr = prom_getenv("modulation");
 350 -  if(!ptr)
 351 -    prom_setenv("modulation", "0xbf");
 352 +  //if(!ptr)
 353 +    //prom_setenv("modulation", "0xbf");
 354
 355  #define EOC_VENDOR_ID "4200534153000000"
 356  #define EOC_VENDOR_REVISION "FW370090708b1_55"
 357 @@ -2959,25 +2980,25 @@ static int tn7dsl_set_dsl(void)
 358    ptr = prom_getenv("eoc_vendor_id");
 359    if(!ptr || strcmp(ptr,EOC_VENDOR_ID) != 0 || strlen(ptr) != strlen(EOC_VENDOR_ID))
 360    {
 361 -      if(ptr)
 362 -         prom_unsetenv("eoc_vendor_id");
 363 -      prom_setenv("eoc_vendor_id",EOC_VENDOR_ID);
 364 +      //if(ptr)
 365 +         //prom_unsetenv("eoc_vendor_id");
 366 +      //prom_setenv("eoc_vendor_id",EOC_VENDOR_ID);
 367    }
 368
 369    ptr = prom_getenv("eoc_vendor_revision");
 370    if(!ptr || strcmp(ptr,EOC_VENDOR_REVISION) != 0 || strlen(ptr) != strlen(EOC_VENDOR_REVISION))
 371    {
 372 -      if(ptr)
 373 -         prom_unsetenv("eoc_vendor_revision");
 374 -      prom_setenv("eoc_vendor_revision",EOC_VENDOR_REVISION);
 375 +      //if(ptr)
 376 +         //prom_unsetenv("eoc_vendor_revision");
 377 +      //prom_setenv("eoc_vendor_revision",EOC_VENDOR_REVISION);
 378    }
 379
 380    ptr = prom_getenv("eoc_vendor_serialnum");
 381    if(!ptr || strcmp(ptr,EOC_VENDOR_SERIALNUM) != 0 || strlen(ptr) != strlen(EOC_VENDOR_SERIALNUM))
 382    {
 383 -      if(ptr)
 384 -         prom_unsetenv("eoc_vendor_serialnum");
 385 -      prom_setenv("eoc_vendor_serialnum",EOC_VENDOR_SERIALNUM);
 386 +      //if(ptr)
 387 +        // prom_unsetenv("eoc_vendor_serialnum");
 388 +      //prom_setenv("eoc_vendor_serialnum",EOC_VENDOR_SERIALNUM);
 389    }
 390
 391    /* Do only if we are in the new Base PSP 7.4.*/
 392 @@ -2994,92 +3015,88 @@ static int tn7dsl_set_dsl(void)
 393               we clear the modulation environment variable, as this could potentially
 394               not have the same meaning in the new mode.
 395            */
 396 -         prom_unsetenv("modulation");
 397 -         prom_setenv("DSL_UPG_DONE", "1");
 398 +         //prom_unsetenv("modulation");
 399 +         //prom_setenv("DSL_UPG_DONE", "1");
 400        }
 401    }
 402    #endif
 403
 404    // modulation
 405    ptr = prom_getenv("modulation");
 406 -  if (ptr)
 407 +  if (ptr || mp_modulation != NULL)
 408    {
 409 -    tn7dsl_set_modulation(ptr, FALSE);
 410 +    tn7dsl_set_modulation(mp_modulation == NULL ? ptr : mp_modulation, FALSE);
 411    }
 412
 413    // Fine Gains
 414    ptr = prom_getenv("fine_gain_control");
 415 -  if (ptr)
 416 +  if (ptr || mp_fine_gain_control != -1)
 417    {
 418 -    value = os_atoi(ptr);
 419 +    value = mp_fine_gain_control == -1 ? os_atoi(ptr) : mp_fine_gain_control;
 420      tn7dsl_ctrl_fineGain(value);
 421    }
 422    ptr = NULL;
 423    ptr = prom_getenv("fine_gain_value");
 424 -  if(ptr)
 425 -    tn7dsl_set_fineGainValue(os_atoh(ptr));
 426 +  if(ptr || mp_fine_gain_value != -1)
 427 +    tn7dsl_set_fineGainValue(mp_fine_gain_value == -1 ? os_atoh(ptr) : mp_fine_gain_value);
 428
 429    // margin retrain
 430    ptr = NULL;
 431    ptr = prom_getenv("enable_margin_retrain");
 432 -  if(ptr)
 433 +  value = mp_enable_margin_retrain == -1 ? (ptr ? os_atoi(ptr) : 0) : mp_enable_margin_retrain;
 434 +
 435 +  if (value == 1)
 436    {
 437 -    value = os_atoi(ptr);
 438 -    if(value == 1)
 439 +    dslhal_api_setMarginMonitorFlags(pIhw, 0, 1);
 440 +    bMarginRetrainEnable = 1;
 441 +    //printk("enable showtime margin monitor.\n");
 442 +
 443 +    ptr = NULL;
 444 +    ptr = prom_getenv("margin_threshold");
 445 +    value = mp_margin_threshold == -1 ? (ptr ? os_atoi(ptr) : 0) : mp_margin_threshold;
 446 +
 447 +    if(value >= 0)
 448      {
 449 -      dslhal_api_setMarginMonitorFlags(pIhw, 0, 1);
 450 -      bMarginRetrainEnable = 1;
 451 -      //printk("enable showtime margin monitor.\n");
 452 -      ptr = NULL;
 453 -      ptr = prom_getenv("margin_threshold");
 454 -      if(ptr)
 455 -      {
 456 -        value = os_atoi(ptr);
 457 -        //printk("Set margin threshold to %d x 0.5 db\n",value);
 458 -        if(value >= 0)
 459 -        {
 460 -          dslhal_api_setMarginThreshold(pIhw, value);
 461 -          bMarginThConfig=1;
 462 -        }
 463 -      }
 464 +      dslhal_api_setMarginThreshold(pIhw, value);
 465 +      bMarginThConfig=1;
 466      }
 467    }
 468
 469    // rate adapt
 470    ptr = NULL;
 471    ptr = prom_getenv("enable_rate_adapt");
 472 -  if(ptr)
 473 +  if(ptr || mp_enable_rate_adapt != -1)
 474    {
 475 -    dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr));
 476 +    dslhal_api_setRateAdaptFlag(pIhw, mp_enable_rate_adapt == -1 ? os_atoi(ptr) : mp_enable_rate_adapt);
 477    }
 478
 479    // set powercutback
 480    ptr = NULL;
 481    ptr = prom_getenv("powercutback");
 482 -  if(ptr)
 483 +  if(ptr || mp_powercutback != -1)
 484    {
 485 -    dslhal_advcfg_onOffPcb(pIhw, os_atoi(ptr));
 486 +    dslhal_advcfg_onOffPcb(pIhw, mp_powercutback == -1 ? os_atoi(ptr) : mp_powercutback);
 487    }
 488
 489    // trellis
 490    ptr = NULL;
 491    ptr = prom_getenv("trellis");
 492 -  if(ptr)
 493 +  if(ptr || mp_trellis != -1)
 494    {
 495 -    dslhal_api_setTrellisFlag(pIhw, os_atoi(ptr));
 496 -    trellis = os_atoi(ptr);
 497 +    trellis = mp_trellis == -1 ? os_atoi(ptr) : mp_trellis;
 498 +    dslhal_api_setTrellisFlag(pIhw, trellis);
 499      //printk("trellis=%d\n");
 500    }
 501
 502    // bitswap
 503    ptr = NULL;
 504    ptr = prom_getenv("bitswap");
 505 -  if(ptr)
 506 +  if(ptr || mp_bitswap != -1)
 507    {
 508      int offset[2] = {33, 0};
 509      unsigned int bitswap;
 510
 511 -    bitswap = os_atoi(ptr);
 512 +    bitswap = mp_bitswap == -1 ? os_atoi(ptr) : mp_bitswap;
 513
 514      tn7dsl_generic_read(2, offset);
 515      dslReg &= dslhal_support_byteSwap32(0xFFFFFF00);
 516 @@ -3097,46 +3114,47 @@ static int tn7dsl_set_dsl(void)
 517    // maximum bits per carrier
 518    ptr = NULL;
 519    ptr = prom_getenv("maximum_bits_per_carrier");
 520 -  if(ptr)
 521 +  if(ptr || mp_maximum_bits_per_carrier != -1)
 522    {
 523 -    dslhal_api_setMaxBitsPerCarrierUpstream(pIhw, os_atoi(ptr));
 524 +    dslhal_api_setMaxBitsPerCarrierUpstream(pIhw, mp_maximum_bits_per_carrier == -1 ? os_atoi(ptr) : mp_maximum_bits_per_carrier);
 525    }
 526
 527    // maximum interleave depth
 528    ptr = NULL;
 529    ptr = prom_getenv("maximum_interleave_depth");
 530 -  if(ptr)
 531 +  if(ptr || mp_maximum_interleave_depth != -1)
 532    {
 533 -    dslhal_api_setMaxInterleaverDepth(pIhw, os_atoi(ptr));
 534 +    dslhal_api_setMaxInterleaverDepth(pIhw, mp_maximum_interleave_depth == -1 ? os_atoi(ptr) : mp_maximum_interleave_depth);
 535    }
 536
 537    // inner and outer pairs
 538    ptr = NULL;
 539    ptr = prom_getenv("pair_selection");
 540 -  if(ptr)
 541 +  if(ptr || mp_pair_selection != -1)
 542    {
 543 -    dslhal_api_selectInnerOuterPair(pIhw, os_atoi(ptr));
 544 +    dslhal_api_selectInnerOuterPair(pIhw, mp_pair_selection == -1 ? os_atoi(ptr) : mp_pair_selection);
 545    }
 546
 547    ptr = NULL;
 548    ptr = prom_getenv("dgas_polarity");
 549 -  if(ptr)
 550 +  if(ptr || mp_dgas_polarity != -1)
 551    {
 552      dslhal_api_configureDgaspLpr(pIhw, 1, 1);
 553 -    dslhal_api_configureDgaspLpr(pIhw, 0, os_atoi(ptr));
 554 +    dslhal_api_configureDgaspLpr(pIhw, 0, mp_dgas_polarity == -1 ? os_atoi(ptr) : mp_dgas_polarity);
 555    }
 556
 557    ptr = NULL;
 558    ptr = prom_getenv("los_alarm");
 559 -  if(ptr)
 560 +  if(ptr || mp_los_alarm != -1)
 561    {
 562 -    dslhal_api_disableLosAlarm(pIhw, os_atoi(ptr));
 563 +    dslhal_api_disableLosAlarm(pIhw, mp_los_alarm == -1 ? os_atoi(ptr) : mp_los_alarm);
 564    }
 565
 566    ptr = NULL;
 567    ptr = prom_getenv("eoc_vendor_id");
 568 -  if(ptr)
 569 +  if(ptr || mp_eoc_vendor_id != NULL)
 570    {
 571 +    ptr = mp_eoc_vendor_id == NULL ? ptr : mp_eoc_vendor_id;
 572      for(i=0;i<8;i++)
 573      {
 574        tmp[0]=ptr[i*2];
 575 @@ -3161,26 +3179,26 @@ static int tn7dsl_set_dsl(void)
 576    }
 577    ptr = NULL;
 578    ptr = prom_getenv("eoc_vendor_revision");
 579 -  if(ptr)
 580 +  if(ptr || mp_eoc_vendor_revision != -1)
 581    {
 582 -    value = os_atoi(ptr);
 583 +    value = mp_eoc_vendor_revision == -1 ? os_atoi(ptr) : mp_eoc_vendor_revision;
 584      //printk("eoc rev=%d\n", os_atoi(ptr));
 585      dslhal_api_setEocRevisionNumber(pIhw, (char *)&value);
 586
 587    }
 588    ptr = NULL;
 589    ptr = prom_getenv("eoc_vendor_serialnum");
 590 -  if(ptr)
 591 +  if(ptr || mp_eoc_vendor_serialnum != NULL)
 592    {
 593 -    dslhal_api_setEocSerialNumber(pIhw, ptr);
 594 +    dslhal_api_setEocSerialNumber(pIhw, mp_eoc_vendor_serialnum == NULL ? ptr : mp_eoc_vendor_serialnum);
 595    }
 596
 597    // CQ10037 Added invntry_vernum environment variable to be able to set version number in ADSL2, ADSL2+ modes.
 598    ptr = NULL;
 599    ptr = prom_getenv("invntry_vernum");
 600 -  if(ptr)
 601 +  if(ptr || mp_invntry_vernum != NULL)
 602    {
 603 -    dslhal_api_setEocRevisionNumber(pIhw, ptr);
 604 +    dslhal_api_setEocRevisionNumber(pIhw, mp_invntry_vernum == NULL ? ptr : mp_invntry_vernum);
 605    }
 606
 607    return 0;
 608 @@ -3225,7 +3243,7 @@ int tn7dsl_init(void *priv)
 609     * backward compatibility.
 610     */
 611    cp = prom_getenv("DSL_BIT_TMODE");
 612 -  if (cp)
 613 +  if (cp || mp_dsl_bit_tmode != -1)
 614    {
 615      printk("%s : env var DSL_BIT_TMODE is set\n", __FUNCTION__);
 616      /*
 617 @@ -3254,9 +3272,9 @@ int tn7dsl_init(void *priv)
 618
 619  //  UR8_MERGE_START CQ11054   Jack Zhang
 620    cp = prom_getenv("high_precision");
 621 -  if (cp)
 622 +  if (cp || mp_high_precision != -1)
 623    {
 624 -    high_precision_selected = os_atoi(cp);
 625 +    high_precision_selected = mp_high_precision == -1 ? os_atoi(cp) : mp_high_precision;
 626    }
 627    if ( high_precision_selected)
 628    {
 629 --- a/tn7sar.c
 630 +++ b/tn7sar.c
 631 @@ -76,6 +76,8 @@ typedef void OS_SETUP;
 632  #include "tn7atm.h"
 633  #include "tn7api.h"
 634
 635 +extern int mp_oam_lb_timeout;
 636 +extern int mp_autopvc_enable;
 637
 638  /* PDSP Firmware files */
 639  #include "tnetd7300_sar_firm.h"
 640 @@ -932,9 +934,9 @@ int tn7sar_setup_oam_channel(Tn7AtmPriva
 641    pHalDev  = (HAL_DEVICE *)priv->pSarHalDev;
 642
 643    pauto_pvc = prom_getenv("autopvc_enable");
 644 -  if(pauto_pvc)  //CQ10273
 645 +  if(pauto_pvc || mp_autopvc_enable != -1)  //CQ10273
 646    {
 647 -    auto_pvc =tn7sar_strtoul(pauto_pvc, NULL, 10);
 648 +    auto_pvc = mp_autopvc_enable == -1 ? tn7sar_strtoul(pauto_pvc, NULL, 10) : mp_autopvc_enable;
 649    }
 650
 651    memset(&chInfo, 0xff, sizeof(chInfo));
 652 @@ -1133,9 +1135,9 @@ int tn7sar_init(struct atm_dev *dev, Tn7
 653
 654    /* read in oam lb timeout value */
 655    pLbTimeout = prom_getenv("oam_lb_timeout");
 656 -  if(pLbTimeout)
 657 +  if(pLbTimeout || mp_oam_lb_timeout != -1)
 658    {
 659 -    lbTimeout =tn7sar_strtoul(pLbTimeout, NULL, 10);
 660 +    lbTimeout = mp_oam_lb_timeout == -1 ? tn7sar_strtoul(pLbTimeout, NULL, 10) : mp_oam_lb_timeout;
 661      oamLbTimeout = lbTimeout;
 662      pHalFunc->Control(pHalDev,"OamLbTimeout", "Set", &lbTimeout);
 663    }