160-module-params.patch 19 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589
  1. --- a/tn7atm.c
  2. +++ b/tn7atm.c
  3. @@ -87,6 +87,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. #ifndef TRUE
  149. @@ -655,9 +795,9 @@ static int __init tn7atm_irq_request (st
  150. * interrupt pacing
  151. */
  152. ptr = prom_getenv ("sar_ipacemax");
  153. - if (ptr)
  154. + if (ptr || mp_sar_ipacemax != -1)
  155. {
  156. - def_sar_inter_pace = os_atoi (ptr);
  157. + def_sar_inter_pace = mp_sar_ipacemax == -1 ? os_atoi (ptr) : mp_sar_ipacemax;
  158. }
  159. /* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM,
  160. def_sar_inter_pace);*/
  161. @@ -795,9 +935,18 @@ static int __init tn7atm_get_ESI (struct
  162. {
  163. int i;
  164. char esi_addr[ESI_LEN] = { 0x00, 0x00, 0x11, 0x22, 0x33, 0x44 };
  165. - char *esiaddr_str = NULL;
  166. + char *esiaddr_str = mp_macc;
  167. - esiaddr_str = prom_getenv ("maca");
  168. + if (esiaddr_str == NULL)
  169. + esiaddr_str = prom_getenv ("macdsl");
  170. + if (esiaddr_str == NULL)
  171. + esiaddr_str = prom_getenv ("macc");
  172. + if (esiaddr_str == NULL)
  173. + esiaddr_str = prom_getenv ("HWA_1");
  174. + if (esiaddr_str == NULL)
  175. + esiaddr_str = prom_getenv ("macb");
  176. + if (esiaddr_str == NULL)
  177. + esiaddr_str = prom_getenv ("maca");
  178. if (!esiaddr_str)
  179. {
  180. @@ -1930,15 +2079,15 @@ static int tn7atm_autoDetectDspBoost (vo
  181. //UR8_MERGE_END CQ10450*
  182. cp = prom_getenv ("dsp_noboost");
  183. - if (cp)
  184. + if (cp || mp_dsp_noboost != -1)
  185. {
  186. - dsp_noboost = os_atoi (cp);
  187. + dsp_noboost = mp_dsp_noboost == -1 ? os_atoi (cp) : mp_dsp_noboost;
  188. }
  189. cp = (char *) prom_getenv ("dsp_freq");
  190. - if (cp)
  191. + if (cp || mp_dsp_freq != -1)
  192. {
  193. - dspfreq = os_atoi (cp);
  194. + dspfreq = mp_dsp_freq == -1 ? os_atoi (cp) : mp_dsp_freq;
  195. if (dspfreq == 250)
  196. {
  197. boostDsp = 1;
  198. @@ -2187,8 +2336,9 @@ static int __init tn7atm_init (struct at
  199. // Inter-Op DSL phy Control
  200. // Note the setting of _dsl_Feature_0 and _dsl_Feature_1 must before
  201. // dslhal_api_dslStartup (in tn7dsl_init()).
  202. - if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_0")) != NULL)
  203. + if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_0")) != NULL || mp_featctl0 != NULL)
  204. {
  205. + if (mp_featctl0 != NULL) ptr = mp_featctl0;
  206. if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to
  207. // os_atoh
  208. ptr += 2;
  209. @@ -2196,8 +2346,9 @@ static int __init tn7atm_init (struct at
  210. _dsl_Feature_0_defined = 1;
  211. }
  212. - if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_1")) != NULL)
  213. + if ((ptr = prom_getenv ("DSL_FEATURE_CNTL_1")) != NULL || mp_featctl1 != NULL)
  214. {
  215. + if (mp_featctl1 != NULL) ptr = mp_featctl1;
  216. if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to
  217. // os_atoh
  218. ptr += 2;
  219. @@ -2209,8 +2360,9 @@ static int __init tn7atm_init (struct at
  220. // DSL phy Feature Control
  221. // Note the setting of _dsl_PhyControl_0 and _dsl_PhyControl_1 must before
  222. // dslhal_api_dslStartup (in tn7dsl_init()).
  223. - if ((ptr = prom_getenv ("DSL_PHY_CNTL_0")) != NULL)
  224. + if ((ptr = prom_getenv ("DSL_PHY_CNTL_0")) != NULL || mp_phyctl0 != NULL)
  225. {
  226. + if (mp_phyctl0 != NULL) ptr = mp_phyctl0;
  227. if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to
  228. // os_atoh
  229. ptr += 2;
  230. @@ -2218,8 +2370,9 @@ static int __init tn7atm_init (struct at
  231. _dsl_PhyControl_0_defined = 1;
  232. }
  233. - if ((ptr = prom_getenv ("DSL_PHY_CNTL_1")) != NULL)
  234. + if ((ptr = prom_getenv ("DSL_PHY_CNTL_1")) != NULL || mp_phyctl1 != NULL)
  235. {
  236. + if (mp_phyctl1 != NULL) ptr = mp_phyctl1;
  237. if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to
  238. // os_atoh
  239. ptr += 2;
  240. @@ -2247,9 +2400,9 @@ static int __init tn7atm_init (struct at
  241. priv->bTurboDsl = 1;
  242. // read config for turbo dsl
  243. ptr = prom_getenv ("TurboDSL");
  244. - if (ptr)
  245. + if (ptr || mp_turbodsl != -1)
  246. {
  247. - priv->bTurboDsl = os_atoi (ptr);
  248. + priv->bTurboDsl = mp_turbodsl == -1 ? os_atoi (ptr) : mp_turbodsl;
  249. }
  250. // @Added to make Rx buffer number & Service max configurable through
  251. @@ -2257,30 +2410,30 @@ static int __init tn7atm_init (struct at
  252. priv->sarRxBuf = RX_BUFFER_NUM;
  253. ptr = NULL;
  254. ptr = prom_getenv ("SarRxBuf");
  255. - if (ptr)
  256. + if (ptr || mp_sar_rxbuf != -1)
  257. {
  258. - priv->sarRxBuf = os_atoi (ptr);
  259. + priv->sarRxBuf = mp_sar_rxbuf == -1 ? os_atoi (ptr) : mp_sar_rxbuf;
  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. priv->sarTxBuf = TX_BUFFER_NUM;
  271. ptr = NULL;
  272. ptr = prom_getenv ("SarTxBuf");
  273. - if (ptr)
  274. + if (ptr || mp_sar_txbuf != -1)
  275. {
  276. - priv->sarTxBuf = os_atoi (ptr);
  277. + priv->sarTxBuf = mp_sar_txbuf == -1 ? os_atoi (ptr) : mp_sar_txbuf;
  278. }
  279. priv->sarTxMax = TX_SERVICE_MAX;
  280. ptr = NULL;
  281. ptr = prom_getenv ("SarTxMax");
  282. - if (ptr)
  283. + if (ptr || mp_sar_txmax != -1)
  284. {
  285. - priv->sarTxMax = os_atoi (ptr);
  286. + priv->sarTxMax = mp_sar_txmax == -1 ? os_atoi (ptr) : mp_sar_txmax;
  287. }
  288. return 0;
  289. --- a/tn7dsl.c
  290. +++ b/tn7dsl.c
  291. @@ -136,6 +136,27 @@
  292. #define NEW_TRAINING_VAL_T1413 128
  293. #define NEW_TRAINING_VAL_MMODE 255
  294. +extern char *mp_modulation;
  295. +extern int mp_fine_gain_control;
  296. +extern int mp_fine_gain_value;
  297. +extern int mp_enable_margin_retrain;
  298. +extern int mp_margin_threshold;
  299. +extern int mp_enable_rate_adapt;
  300. +extern int mp_powercutback;
  301. +extern int mp_trellis;
  302. +extern int mp_bitswap;
  303. +extern int mp_maximum_bits_per_carrier;
  304. +extern int mp_maximum_interleave_depth;
  305. +extern int mp_pair_selection;
  306. +extern int mp_dgas_polarity;
  307. +extern int mp_los_alarm;
  308. +extern char *mp_eoc_vendor_id;
  309. +extern int mp_eoc_vendor_revision;
  310. +extern char *mp_eoc_vendor_serialnum;
  311. +extern char *mp_invntry_vernum;
  312. +extern int mp_dsl_bit_tmode;
  313. +extern int mp_high_precision;
  314. +
  315. int testflag1 = 0;
  316. extern int __guDbgLevel;
  317. extern sar_stat_t sarStat;
  318. @@ -2818,84 +2839,80 @@ static int tn7dsl_set_dsl(void)
  319. // modulation
  320. ptr = prom_getenv("modulation");
  321. - if (ptr)
  322. + if (ptr || mp_modulation != NULL)
  323. {
  324. - tn7dsl_set_modulation(ptr, FALSE);
  325. + tn7dsl_set_modulation(mp_modulation == NULL ? ptr : mp_modulation, FALSE);
  326. }
  327. // Fine Gains
  328. ptr = prom_getenv("fine_gain_control");
  329. - if (ptr)
  330. + if (ptr || mp_fine_gain_control != -1)
  331. {
  332. - value = os_atoi(ptr);
  333. + value = mp_fine_gain_control == -1 ? os_atoi(ptr) : mp_fine_gain_control;
  334. tn7dsl_ctrl_fineGain(value);
  335. }
  336. ptr = NULL;
  337. ptr = prom_getenv("fine_gain_value");
  338. - if(ptr)
  339. - tn7dsl_set_fineGainValue(os_atoh(ptr));
  340. + if(ptr || mp_fine_gain_value != -1)
  341. + tn7dsl_set_fineGainValue(mp_fine_gain_value == -1 ? os_atoh(ptr) : mp_fine_gain_value);
  342. // margin retrain
  343. ptr = NULL;
  344. ptr = prom_getenv("enable_margin_retrain");
  345. - if(ptr)
  346. + value = mp_enable_margin_retrain == -1 ? (ptr ? os_atoi(ptr) : 0) : mp_enable_margin_retrain;
  347. +
  348. + if (value == 1)
  349. {
  350. - value = os_atoi(ptr);
  351. - if(value == 1)
  352. + dslhal_api_setMarginMonitorFlags(pIhw, 0, 1);
  353. + bMarginRetrainEnable = 1;
  354. + //printk("enable showtime margin monitor.\n");
  355. +
  356. + ptr = NULL;
  357. + ptr = prom_getenv("margin_threshold");
  358. + value = mp_margin_threshold == -1 ? (ptr ? os_atoi(ptr) : 0) : mp_margin_threshold;
  359. +
  360. + if(value >= 0)
  361. {
  362. - dslhal_api_setMarginMonitorFlags(pIhw, 0, 1);
  363. - bMarginRetrainEnable = 1;
  364. - //printk("enable showtime margin monitor.\n");
  365. - ptr = NULL;
  366. - ptr = prom_getenv("margin_threshold");
  367. - if(ptr)
  368. - {
  369. - value = os_atoi(ptr);
  370. - //printk("Set margin threshold to %d x 0.5 db\n",value);
  371. - if(value >= 0)
  372. - {
  373. - dslhal_api_setMarginThreshold(pIhw, value);
  374. - bMarginThConfig=1;
  375. - }
  376. - }
  377. + dslhal_api_setMarginThreshold(pIhw, value);
  378. + bMarginThConfig=1;
  379. }
  380. }
  381. // rate adapt
  382. ptr = NULL;
  383. ptr = prom_getenv("enable_rate_adapt");
  384. - if(ptr)
  385. + if(ptr || mp_enable_rate_adapt != -1)
  386. {
  387. - dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr));
  388. + dslhal_api_setRateAdaptFlag(pIhw, mp_enable_rate_adapt == -1 ? os_atoi(ptr) : mp_enable_rate_adapt);
  389. }
  390. // set powercutback
  391. ptr = NULL;
  392. ptr = prom_getenv("powercutback");
  393. - if(ptr)
  394. + if(ptr || mp_powercutback != -1)
  395. {
  396. - dslhal_advcfg_onOffPcb(pIhw, os_atoi(ptr));
  397. + dslhal_advcfg_onOffPcb(pIhw, mp_powercutback == -1 ? os_atoi(ptr) : mp_powercutback);
  398. }
  399. // trellis
  400. ptr = NULL;
  401. ptr = prom_getenv("trellis");
  402. - if(ptr)
  403. + if(ptr || mp_trellis != -1)
  404. {
  405. - dslhal_api_setTrellisFlag(pIhw, os_atoi(ptr));
  406. - trellis = os_atoi(ptr);
  407. + trellis = mp_trellis == -1 ? os_atoi(ptr) : mp_trellis;
  408. + dslhal_api_setTrellisFlag(pIhw, trellis);
  409. //printk("trellis=%d\n");
  410. }
  411. // bitswap
  412. ptr = NULL;
  413. ptr = prom_getenv("bitswap");
  414. - if(ptr)
  415. + if(ptr || mp_bitswap != -1)
  416. {
  417. int offset[2] = {33, 0};
  418. unsigned int bitswap;
  419. - bitswap = os_atoi(ptr);
  420. + bitswap = mp_bitswap == -1 ? os_atoi(ptr) : mp_bitswap;
  421. tn7dsl_generic_read(2, offset);
  422. dslReg &= dslhal_support_byteSwap32(0xFFFFFF00);
  423. @@ -2913,46 +2930,47 @@ static int tn7dsl_set_dsl(void)
  424. // maximum bits per carrier
  425. ptr = NULL;
  426. ptr = prom_getenv("maximum_bits_per_carrier");
  427. - if(ptr)
  428. + if(ptr || mp_maximum_bits_per_carrier != -1)
  429. {
  430. - dslhal_api_setMaxBitsPerCarrierUpstream(pIhw, os_atoi(ptr));
  431. + dslhal_api_setMaxBitsPerCarrierUpstream(pIhw, mp_maximum_bits_per_carrier == -1 ? os_atoi(ptr) : mp_maximum_bits_per_carrier);
  432. }
  433. // maximum interleave depth
  434. ptr = NULL;
  435. ptr = prom_getenv("maximum_interleave_depth");
  436. - if(ptr)
  437. + if(ptr || mp_maximum_interleave_depth != -1)
  438. {
  439. - dslhal_api_setMaxInterleaverDepth(pIhw, os_atoi(ptr));
  440. + dslhal_api_setMaxInterleaverDepth(pIhw, mp_maximum_interleave_depth == -1 ? os_atoi(ptr) : mp_maximum_interleave_depth);
  441. }
  442. // inner and outer pairs
  443. ptr = NULL;
  444. ptr = prom_getenv("pair_selection");
  445. - if(ptr)
  446. + if(ptr || mp_pair_selection != -1)
  447. {
  448. - dslhal_api_selectInnerOuterPair(pIhw, os_atoi(ptr));
  449. + dslhal_api_selectInnerOuterPair(pIhw, mp_pair_selection == -1 ? os_atoi(ptr) : mp_pair_selection);
  450. }
  451. ptr = NULL;
  452. ptr = prom_getenv("dgas_polarity");
  453. - if(ptr)
  454. + if(ptr || mp_dgas_polarity != -1)
  455. {
  456. dslhal_api_configureDgaspLpr(pIhw, 1, 1);
  457. - dslhal_api_configureDgaspLpr(pIhw, 0, os_atoi(ptr));
  458. + dslhal_api_configureDgaspLpr(pIhw, 0, mp_dgas_polarity == -1 ? os_atoi(ptr) : mp_dgas_polarity);
  459. }
  460. ptr = NULL;
  461. ptr = prom_getenv("los_alarm");
  462. - if(ptr)
  463. + if(ptr || mp_los_alarm != -1)
  464. {
  465. - dslhal_api_disableLosAlarm(pIhw, os_atoi(ptr));
  466. + dslhal_api_disableLosAlarm(pIhw, mp_los_alarm == -1 ? os_atoi(ptr) : mp_los_alarm);
  467. }
  468. ptr = NULL;
  469. ptr = prom_getenv("eoc_vendor_id");
  470. - if(ptr)
  471. + if(ptr || mp_eoc_vendor_id != NULL)
  472. {
  473. + ptr = mp_eoc_vendor_id == NULL ? ptr : mp_eoc_vendor_id;
  474. for(i=0;i<8;i++)
  475. {
  476. tmp[0]=ptr[i*2];
  477. @@ -2977,26 +2995,26 @@ static int tn7dsl_set_dsl(void)
  478. }
  479. ptr = NULL;
  480. ptr = prom_getenv("eoc_vendor_revision");
  481. - if(ptr)
  482. + if(ptr || mp_eoc_vendor_revision != -1)
  483. {
  484. - value = os_atoi(ptr);
  485. + value = mp_eoc_vendor_revision == -1 ? os_atoi(ptr) : mp_eoc_vendor_revision;
  486. //printk("eoc rev=%d\n", os_atoi(ptr));
  487. dslhal_api_setEocRevisionNumber(pIhw, (char *)&value);
  488. }
  489. ptr = NULL;
  490. ptr = prom_getenv("eoc_vendor_serialnum");
  491. - if(ptr)
  492. + if(ptr || mp_eoc_vendor_serialnum != NULL)
  493. {
  494. - dslhal_api_setEocSerialNumber(pIhw, ptr);
  495. + dslhal_api_setEocSerialNumber(pIhw, mp_eoc_vendor_serialnum == NULL ? ptr : mp_eoc_vendor_serialnum);
  496. }
  497. // CQ10037 Added invntry_vernum environment variable to be able to set version number in ADSL2, ADSL2+ modes.
  498. ptr = NULL;
  499. ptr = prom_getenv("invntry_vernum");
  500. - if(ptr)
  501. + if(ptr || mp_invntry_vernum != NULL)
  502. {
  503. - dslhal_api_setEocRevisionNumber(pIhw, ptr);
  504. + dslhal_api_setEocRevisionNumber(pIhw, mp_invntry_vernum == NULL ? ptr : mp_invntry_vernum);
  505. }
  506. return 0;
  507. @@ -3041,7 +3059,7 @@ int tn7dsl_init(void *priv)
  508. * backward compatibility.
  509. */
  510. cp = prom_getenv("DSL_BIT_TMODE");
  511. - if (cp)
  512. + if (cp || mp_dsl_bit_tmode != -1)
  513. {
  514. printk("%s : env var DSL_BIT_TMODE is set\n", __FUNCTION__);
  515. /*
  516. @@ -3070,9 +3088,9 @@ int tn7dsl_init(void *priv)
  517. // UR8_MERGE_START CQ11054 Jack Zhang
  518. cp = prom_getenv("high_precision");
  519. - if (cp)
  520. + if (cp || mp_high_precision != -1)
  521. {
  522. - high_precision_selected = os_atoi(cp);
  523. + high_precision_selected = mp_high_precision == -1 ? os_atoi(cp) : mp_high_precision;
  524. }
  525. if ( high_precision_selected)
  526. {
  527. --- a/tn7sar.c
  528. +++ b/tn7sar.c
  529. @@ -74,6 +74,8 @@ typedef void OS_SETUP;
  530. /* PDSP Firmware files */
  531. #include "tnetd7300_sar_firm.h"
  532. +extern int mp_oam_lb_timeout;
  533. +extern int mp_autopvc_enable;
  534. enum
  535. {
  536. @@ -817,9 +819,9 @@ int tn7sar_setup_oam_channel(Tn7AtmPriva
  537. pHalDev = (HAL_DEVICE *)priv->pSarHalDev;
  538. pauto_pvc = prom_getenv("autopvc_enable");
  539. - if(pauto_pvc) //CQ10273
  540. + if(pauto_pvc || mp_autopvc_enable != -1) //CQ10273
  541. {
  542. - auto_pvc =tn7sar_strtoul(pauto_pvc, NULL, 10);
  543. + auto_pvc = mp_autopvc_enable == -1 ? tn7sar_strtoul(pauto_pvc, NULL, 10) : mp_autopvc_enable;
  544. }
  545. memset(&chInfo, 0xff, sizeof(chInfo));
  546. @@ -985,9 +987,9 @@ int tn7sar_init(struct atm_dev *dev, Tn7
  547. /* read in oam lb timeout value */
  548. pLbTimeout = prom_getenv("oam_lb_timeout");
  549. - if(pLbTimeout)
  550. + if(pLbTimeout || mp_oam_lb_timeout != -1)
  551. {
  552. - lbTimeout =tn7sar_strtoul(pLbTimeout, NULL, 10);
  553. + lbTimeout = mp_oam_lb_timeout == -1 ? tn7sar_strtoul(pLbTimeout, NULL, 10) : mp_oam_lb_timeout;
  554. oamLbTimeout = lbTimeout;
  555. pHalFunc->Control(pHalDev,"OamLbTimeout", "Set", &lbTimeout);
  556. }