From patchwork Wed Dec 30 20:59:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 561814 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D9059140C14 for ; Thu, 31 Dec 2015 08:05:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b=ReDQtTLW; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id CC90A28022B; Wed, 30 Dec 2015 22:01:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D853528BE25 for ; Wed, 30 Dec 2015 21:59:28 +0100 (CET) X-policyd-weight: using cached result; rate: -5.5 Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 30 Dec 2015 21:59:12 +0100 (CET) Received: by mail-wm0-f53.google.com with SMTP id f206so47839461wmf.0 for ; Wed, 30 Dec 2015 12:59:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=f3cexxz4hAA8Pq5AviJIAwKxOEH5NmNYIsSdX80m+OU=; b=ReDQtTLWyU/DbU0ofzZty8WkXGdo7D2BWcUnsNasq6tKwLklEcEHWRraTsw5H6pdgx m+y7hSdeMLMHWO8Vz0ScM6H95xUHsj1M6YZZqqPeWEc3mPx0pIVqwxSs/q7M9NNsudYL hC6uvgHWup2yf77VKQwz7tNtH3iSeFDQ7mAZyXfqnKfeAYp8Fa/0Wnu674KClvo7+ZQA /u3BRpP286t+4SbIgqmXeAgn5fh0ZNUbGTAg49a3v3SGTDAr5lo3CL+OL2WvzSgt0BSP XYn5BXlO+LZkPCS89ebNXSzTEqD6+f9rHPj0PSydbXao/ZP8tU8VAPINOnBDCCe4xFL0 RGRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=f3cexxz4hAA8Pq5AviJIAwKxOEH5NmNYIsSdX80m+OU=; b=cJ9yj02/KcGlRtNc6nGQiemBq9zn8QMZFGJDP/dCh26gZqYpKcrmRbdnY5Mjb/fN0U rtFIivwKQuCrAMQ4AdTcPWxJH69g3uVDQgy2hhB42GdTyJIOkun5UfEKd5o0GeFnOy+f 3Fty4auOchq2GqYL6UbfbYQUjeDFOSjZDf1xjmzQfmy8ZoCc6WHMjKzHtokWFrxvZvvl vMfiQLMYZQD0pOemImM1HOoKsaPws35FzLdbv7w5TdWUmDzM2/xrJycHqLTSjLjmGRb+ 8gzft+GjJH8GGKk518To3LBrVpA0zM3Jmr81zmIe2p8fNTIy0IsOZaXqtsWmCjrtqRGc bUUA== X-Gm-Message-State: ALoCoQmVO2cR/pzfwIuh0SIPD1pvtFFMEriWFkUfXGo1pbjGD5eEp3eZthJ/AcK2JfTCIF4NIZb6xdh8EvPTyDu+3l39QRPJTA== X-Received: by 10.28.99.69 with SMTP id x66mr50770813wmb.10.1451509176685; Wed, 30 Dec 2015 12:59:36 -0800 (PST) Received: from desktop.wvd.kresin.me (p5DDC4988.dip0.t-ipconnect.de. [93.220.73.136]) by smtp.gmail.com with ESMTPSA id t9sm12512564wjf.33.2015.12.30.12.59.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Dec 2015 12:59:36 -0800 (PST) From: Mathias Kresin To: openwrt-devel@lists.openwrt.org Date: Wed, 30 Dec 2015 21:59:26 +0100 Message-Id: <1451509166-5157-6-git-send-email-openwrt@kresin.me> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451509166-5157-1-git-send-email-openwrt@kresin.me> References: <1451509166-5157-1-git-send-email-openwrt@kresin.me> Subject: [OpenWrt-Devel] [PATCH v2 5/5] ltq-vdsl-app: re-add lowlevel settings X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Add back a slightly modified version of the lowlevel settings which where removed with r46920. In compare to the old lowlevel settings, the B43c tone is added to tone_adsl_b and tone_adsl_bv. If an unsupported tone value is used, the auto probing mode is used, in compare to the fallback to tone_adsl_av and tone_vdsl_av with the old lowlevel settings. Signed-off-by: Mathias Kresin --- I've done some tests to see in which situations the tone setting is required. In cases no tone is specified, the tone is used according to the loaded firmware or set by the loaded firmware. Using a device with the hybrid set to POTS (Annex A) on a Deutsche Telekom VDSL2 line which requires the B43 tone, I made the following observations: annex setting firmware tone setting result ------------------------------------------------------- annex a adsl-a.bin no tone no sync annex a adsl-a.bin b sync annex a adsl-b.bin no tone sync no annex adsl-a.bin no tone no sync no annex adsl-a.bin b sync no annex adsl-b.bin no tone sync I would vote for using 'auto' for the initial config here as well. I would expect that people who are using an Annex A device in an Annex B network know how to set the correct tone value. .../network/config/ltq-vdsl-app/files/dsl_control | 88 ++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control index fe098d7..4ddc1d7 100644 --- a/package/network/config/ltq-vdsl-app/files/dsl_control +++ b/package/network/config/ltq-vdsl-app/files/dsl_control @@ -38,6 +38,81 @@ xtse_xdsl_b="10_00_10_00_00_04_00_0F" # G.993.5 Annex A/B/C xtse_xdsl_j="10_00_10_40_00_04_01_0F" +# +# ITU-T G.994.1 (06/2012) - Table 2 (Mandatory carrier sets) +# + +# A43 +tone_adsl_a="0x142" # A43C + J43 + A43 +tone_vdsl_a="0x142" # A43C + J43 + A43 + +# A43 + V43 +tone_adsl_av="0x142" # A43C + J43 + A43 +tone_vdsl_av="0x146" # A43C + J43 + A43 + V43 + +# B43 +tone_adsl_b="0x81" # B43 + B43c +tone_vdsl_b="0x1" # B43 + +# B43 + V43 +tone_adsl_bv="0x81" # B43 + B43c +tone_vdsl_bv="0x5" # B43 + V43 + +lowlevel_cfg() { + echo "# VRX Low Level Configuration File +# +# Parameters must be separated by tabs or spaces. +# Empty lines and comments will be ignored. +# + +# nFilter +# +# NA = -1 +# OFF = 0 +# ISDN = 1 +# POTS = 2 +# POTS_2 = 3 +# POTS_3 = 4 +# +# (dec) + -1 + +# nHsToneGroupMode nHsToneGroup_A nHsToneGroup_V nHsToneGroup_AV +# +# NA = -1 NA = -1 see see +# AUTO = 0 VDSL2_B43 = 0x0001 nHsToneGroup_A nHsToneGroup_A +# MANUAL = 1 VDSL2_A43 = 0x0002 +# VDSL2_V43 = 0x0004 +# VDSL1_V43P = 0x0008 +# VDSL1_V43I = 0x0010 +# ADSL1_C43 = 0x0020 +# ADSL2_J43 = 0x0040 +# ADSL2_B43C = 0x0080 +# ADSL2_A43C = 0x0100 +# +# (dec) (hex) (hex) (hex) + 1 $1 $2 0x0 + +# nBaseAddr nIrqNum +# +# (hex) (dec) + 0x1e116000 63 + +# nUtopiaPhyAdr nUtopiaBusWidth nPosPhyParity +# default(16b) = 0 NA = -1 +# 8-bit = 1 ODD = 0 +# 16-bit = 2 +# +# +# (hex) (dec) (dec) + 0xFF 0 0 + +# bNtrEnable +# +# (dec) + 0" > /tmp/lowlevel.cfg +} + service_triggers() { procd_add_reload_trigger network } @@ -45,10 +120,15 @@ service_triggers() { start_service() { local annex local firmware + local tone + local tone_adsl + local tone_vdsl local xtse local mode + local lowlevel config_load network + config_get tone dsl tone config_get annex dsl annex config_get firmware dsl firmware config_get xfer_mode dsl xfer_mode @@ -76,11 +156,19 @@ start_service() { return 1 } + eval "tone_adsl=\"\${tone_adsl_$tone}\"" + eval "tone_vdsl=\"\${tone_vdsl_$tone}\"" + [ -n "${tone_adsl}" ] && [ -n "${tone_vdsl}" ] && { + lowlevel_cfg "${tone_adsl}" "${tone_vdsl}" + lowlevel="-l /tmp/lowlevel.cfg" + } + procd_open_instance procd_set_param command /sbin/vdsl_cpe_control_wrapper \ -i$xtse \ -n /sbin/dsl_notify.sh \ -f ${firmware} \ + $lowlevel \ -M ${mode} procd_append_param env "LOAD=$LOAD" "UNLOAD=$UNLOAD" procd_close_instance