ltq-vdsl-app: do not set the reserved bit 4 in the xTSE 8

[openwrt/openwrt.git] / package / network / config / ltq-vdsl-app / files / dsl_control

diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index 4ddc1d7880e240b32aca93db8388329e4f5db9ae..5ca1b12eea90cb70c7a6ef89e6f32ab3b8e58a80 100644 (file)
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -16,18 +16,19 @@ EXTRA_HELP="        status  Get DSL status information
 # ITU-T G.997.1 Amendment 2 (04/2013) - Section 2.1 - (Vectoring mode enable (VECTORMODE_ENABLE))
 #
 # G.992.1 Annex A
+# G.992.2 Annex A
 # G.992.3 Annex A / L-US1 / L_US-2 / M
 # G.992.5 Annex A / M
 # G.993.2 Annex A/B/C
 # G.993.5 Annex A/B/C
-xtse_xdsl_a="04_00_04_00_4C_01_04_0F"
+xtse_xdsl_a="05_01_04_00_4C_01_04_07"
 
 # G.992.1 Annex B
 # G.992.3 Annex B
 # G.992.5 Annex B
 # G.993.2 Annex A/B/C
 # G.993.5 Annex A/B/C
-xtse_xdsl_b="10_00_10_00_00_04_00_0F"
+xtse_xdsl_b="10_00_10_00_00_04_00_07"
 
 # G.992.1 Annex B
 # G.992.3 Annex B
@@ -36,7 +37,44 @@ xtse_xdsl_b="10_00_10_00_00_04_00_0F"
 # G.992.5 Annex J
 # G.993.2 Annex A/B/C
 # G.993.5 Annex A/B/C
-xtse_xdsl_j="10_00_10_40_00_04_01_0F"
+xtse_xdsl_j="10_00_10_40_00_04_01_07"
+
+# G.992.1 Annex B
+xtse_xdsl_bdmt="10_00_00_00_00_00_00_00"
+
+# G.992.3 Annex B
+xtse_xdsl_b2="00_00_10_00_00_00_00_00"
+
+# G.992.5 Annex B
+xtse_xdsl_b2p="00_00_00_00_00_04_00_00"
+
+# ANSI T1.413
+xtse_xdsl_at1="01_00_00_00_00_00_00_00"
+
+# G.992.2 Annex A
+xtse_xdsl_alite="00_01_00_00_00_00_00_00"
+
+# G.992.1 Annex A
+xtse_xdsl_admt="04_00_00_00_00_00_00_00"
+
+# G.992.3 Annex A
+xtse_xdsl_a2="00_00_04_00_00_00_00_00"
+
+# G.992.5 Annex A
+xtse_xdsl_a2p="00_00_00_00_00_01_00_00"
+
+# G.992.3 Annex L
+xtse_xdsl_l="00_00_00_00_0C_00_00_00"
+
+# G.992.3 Annex M
+# G.992.5 Annex M
+xtse_xdsl_m="00_00_00_00_40_00_04_00"
+
+# G.992.3 Annex M
+xtse_xdsl_m2="00_00_00_00_40_00_00_00"
+
+# G.992.5 Annex M
+xtse_xdsl_m2p="00_00_00_00_00_00_04_00"
 
 #
 # ITU-T G.994.1 (06/2012) - Table 2 (Mandatory carrier sets)
@@ -124,6 +162,8 @@ start_service() {
        local tone_adsl
        local tone_vdsl
        local xtse
+       local xfer_mode
+       local line_mode
        local mode
        local lowlevel
 
@@ -132,6 +172,9 @@ start_service() {
        config_get annex dsl annex
        config_get firmware dsl firmware
        config_get xfer_mode dsl xfer_mode
+       config_get line_mode dsl line_mode
+
+       eval "xtse=\"\${xtse_xdsl_$annex}\""
 
        [ -z "${xfer_mode}" ] && xfer_mode=ptm
 
@@ -139,16 +182,72 @@ start_service() {
        atm)
                LOAD=ltq_atm_vr9
                UNLOAD=ltq_ptm_vr9
-               mode=1
+
+               # in most cases atm is used on top of adsl
+               [ -z "${line_mode}" ] && line_mode=adsl
                ;;
        *)
                LOAD=ltq_ptm_vr9
                UNLOAD=ltq_atm_vr9
+
+               # in most cases ptm is used on top of vdsl
+               [ -z "${line_mode}" ] && line_mode=vdsl
+               ;;
+       esac
+
+       case "${line_mode}" in
+       adsl)
+               mode=1
+
+               # mask out VDSL bits when ATM is requested
+               xtse="${xtse%_*}_00"
+               ;;
+       *)
                mode=2
                ;;
        esac
 
-       eval "xtse=\"\${xtse_xdsl_$annex}\""
+       if [ -z "${firmware}" ]; then
+               # search for the firmware provided by dsl-vrx200-firmware-xdsl-*
+               if grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo; then
+                       case "${annex}" in
+                       a*|l*|m*)
+                               if [ -f "/lib/firmware/lantiq-vrx200-a.bin" ]; then
+                                       firmware="/lib/firmware/lantiq-vrx200-a.bin"
+                               elif [ -f "/tmp/lantiq-vrx200-a.bin" ]; then
+                                       firmware="/tmp/lantiq-vrx200-a.bin"
+                               elif [ -f "/lib/firmware/lantiq-vrx200-b.bin" ] && [ -f "/lib/firmware/lantiq-vrx200-b-to-a.bspatch" ]; then
+                                       bspatch /lib/firmware/lantiq-vrx200-b.bin \
+                                               /tmp/lantiq-vrx200-a.bin \
+                                               /lib/firmware/lantiq-vrx200-b-to-a.bspatch
+                                       firmware="/tmp/lantiq-vrx200-a.bin"
+                               else
+                                       echo "firmware for annex a not found"
+                                       return 1
+                               fi
+                               ;;
+                       b*|j*)
+                               if [ -f "/lib/firmware/lantiq-vrx200-b.bin" ]; then
+                                       firmware="/lib/firmware/lantiq-vrx200-b.bin"
+                               elif [ -f "/tmp/lantiq-vrx200-b.bin" ]; then
+                                       firmware="/tmp/lantiq-vrx200-b.bin"
+                               elif [ -f "/lib/firmware/lantiq-vrx200-a.bin" ] && [ -f "/lib/firmware/lantiq-vrx200-a-to-b.bspatch" ]; then
+                                       bspatch /lib/firmware/lantiq-vrx200-a.bin \
+                                               /tmp/lantiq-vrx200-b.bin \
+                                               /lib/firmware/lantiq-vrx200-a-to-b.bspatch
+                                       firmware="/tmp/lantiq-vrx200-b.bin"
+                               else
+                                       echo "firmware for annex b not found"
+                                       return 1
+                               fi
+                               ;;
+                       *)
+                               echo "annex type not supported use a or b"
+                               return 1
+                               ;;
+                       esac
+               fi
+       fi
 
        [ -z "${firmware}" ] && firmware=/lib/firmware/vdsl.bin
        [ -f "${firmware}" ] || {
@@ -175,6 +274,8 @@ start_service() {
 }
 
 stop_service() {
+       # do not use dsl_cmd to not block when this is locked up by some other proess
+       echo quit > /tmp/pipe/dsl_cpe0_cmd
        DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \
        DSL_INTERFACE_STATUS="DOWN" \
                /sbin/dsl_notify.sh