From patchwork Fri Jan 4 12:48:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 1020722 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hotmail.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43WPkG5MHLz9rxp for ; Fri, 4 Jan 2019 23:49:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727521AbfADMss (ORCPT ); Fri, 4 Jan 2019 07:48:48 -0500 Received: from mail-oln040092068052.outbound.protection.outlook.com ([40.92.68.52]:21312 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725913AbfADMsm (ORCPT ); Fri, 4 Jan 2019 07:48:42 -0500 Received: from HE1EUR02FT009.eop-EUR02.prod.protection.outlook.com (10.152.10.58) by HE1EUR02HT015.eop-EUR02.prod.protection.outlook.com (10.152.11.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13; Fri, 4 Jan 2019 12:48:38 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com (10.152.10.52) by HE1EUR02FT009.mail.protection.outlook.com (10.152.10.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13 via Frontend Transport; Fri, 4 Jan 2019 12:48:38 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e]) by DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e%4]) with mapi id 15.20.1516.000; Fri, 4 Jan 2019 12:48:38 +0000 From: Bernd Edlinger To: Ping-Ke Shih , Larry Finger , Kalle Valo , "David S. Miller" , "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH 1/4] rtlwifi: rtl8723ae: Take the FW LPS mode handling out Thread-Topic: [PATCH 1/4] rtlwifi: rtl8723ae: Take the FW LPS mode handling out Thread-Index: AQHUpCvPwWPgT51ue0O3JoR8mq9joA== Date: Fri, 4 Jan 2019 12:48:37 +0000 Message-ID: Accept-Language: en-US, en-GB, de-DE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0201CA0020.eurprd02.prod.outlook.com (2603:10a6:203:3d::30) To DB7PR07MB5353.eurprd07.prod.outlook.com (2603:10a6:10:6e::26) x-incomingtopheadermarker: OriginalChecksum:F65FC2DAA506C115788BAEECCEC77591E925FE15A1629708F727F7657872AB07; UpperCasedChecksum:6CB205A53DBE57A6ED15B3EC2F98DF376A124A034472A3B43612C0698AE06942; SizeAsReceived:8763; Count:62 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [IFcncr/GriuuOUBiY3vPDgAtXCDBdt+G] x-microsoft-original-message-id: <58a45880-a96c-70c0-0d6d-e0e9c39537b9@hotmail.de> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR02HT015; 6:ZlOAQ34PDsn6Z5iaT6QMy7wfGCPFg0kSfHLpZObtxPUseY0pY7OgSMgJjdAJLb3+9+z/x+uzBtY4PAkBxs6hcRSBNndfq3AR7tQwsLxCFdKCIDSw+yiue9SWGdfkTlPTsa2jq5gGwJPsjT/Tibt9PTv3h1uujZNwixP9yKZot7XurbiaD1O+NbPcTvIwbuVZp+zd2N97jGr3caeVS1z97+DYUODxoJTW9QPAlSEe3KpCMahbh+Or0BSlrAVlRh9nabP3XuiwH0RC4R4W5zLk611050MJDSusPl7IixESyRtGiBvkcbfVs8fmjiN1CG2jyzp04zC1vQmU8zP488bvihfQmWTMdz/yRVJQdzi74A2MLsUkdzOxzcJHv2RfQ4wCnn2xM7pajJUpBeqS2qxIb2uAqGMwZjMm4ceeWjual2GxAvr5zSAU49WoQJ9GZDpySwSFHi31waphlc2DUMd/WA==; 5:dKm8WrNaP5NPGx8th6bSgpqYlM+HztSUSv9a6/xYcYqosL3yFMkmQSr+wf09gbjAuPEPBnMFdNkKS04ZDDSMdRnBpkV8IkRi9LnxxLYNnhPdvJSNT8r4GrnhWR8nuhodVG8kGiqWVOe9wb3zZh5/nT04deooZOP+owqSp7J3Ap8=; 7:CwyfP2Q65stLMMfFfhAQt7FRCOwRHte6ixJWpDy5XUangQ0RYnw5wmsLNJm7Du32S2PzT+RqU0HqZx3SBP0IxRWYf7KTsYHjzpAMSXBIdGjV3Dt3hgxMNzAQfYWLSMxvTkiWuKsja9Y7HOH68KDLwg== x-incomingheadercount: 62 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:HE1EUR02HT015; x-ms-traffictypediagnostic: HE1EUR02HT015: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:HE1EUR02HT015; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR02HT015; x-microsoft-antispam-message-info: 1RYPzCw1hR8v9O2KdiXMVgrDhAX2pooCFOEzWc3KmlUoLqG7r6Aq7ZPSDb0lJzTy Content-ID: <77BCC8A5BDCDEF44A6C9237DF78B5080@eurprd07.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-Network-Message-Id: 4d28e800-430a-4a4e-4e42-08d67242f23d X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jan 2019 12:48:37.1859 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT015 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This appears to trigger a firmware bug and causes severe problems with rtl8723ae PCI devices. When the power save mode is activated for longer periods of time the firmware stops to receive any packets. This problem was exposed by commit 873ffe154ae0 ("rtlwifi: Fix logic error in enter/exit power-save mode"). Previously the power save mode was only active rarely and only for a short time so that the problem was not noticeable. Signed-off-by: Bernd Edlinger --- .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 20 -------- .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 1 - .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 56 +--------------------- 3 files changed, 1 insertion(+), 76 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c index bf9859f..77833fb 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c @@ -268,26 +268,6 @@ void rtl8723e_fill_h2c_cmd(struct ieee80211_hw *hw, (u8 *)&tmp_cmdbuf); } -void rtl8723e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) -{ - struct rtl_priv *rtlpriv = rtl_priv(hw); - u8 u1_h2c_set_pwrmode[3] = { 0 }; - struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); - - RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode); - - SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode); - SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode, - (rtlpriv->mac80211.p2p) ? ppsc->smart_ps : 1); - SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(u1_h2c_set_pwrmode, - ppsc->reg_max_lps_awakeintvl); - - RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG, - "rtl8723e_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n", - u1_h2c_set_pwrmode, 3); - rtl8723e_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode); -} - #define BEACON_PG 0 /* ->1 */ #define PSPOLL_PG 2 #define NULL_PG 3 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h index 2e668fc..8618b82 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h @@ -55,7 +55,6 @@ void rtl8723e_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id, u32 cmd_len, u8 *p_cmdbuffer); -void rtl8723e_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode); void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished); void rtl8723e_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus); void rtl8723e_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state); diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c index f783e4a..f0eb356 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c @@ -408,29 +408,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) case HW_VAR_WPA_CONFIG: rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *)val)); break; - case HW_VAR_SET_RPWM:{ - u8 rpwm_val; - - rpwm_val = rtl_read_byte(rtlpriv, REG_PCIE_HRPWM); - udelay(1); - - if (rpwm_val & BIT(7)) { - rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, - (*(u8 *)val)); - } else { - rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, - ((*(u8 *)val) | BIT(7))); - } - - break; - } case HW_VAR_H2C_FW_PWRMODE:{ - u8 psmode = (*(u8 *)val); - - if (psmode != FW_PS_ACTIVE_MODE) - rtl8723e_dm_rf_saving(hw, true); - - rtl8723e_set_fw_pwrmode_cmd(hw, (*(u8 *)val)); break; } case HW_VAR_FW_PSMODE_STATUS: @@ -513,39 +491,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) break; } case HW_VAR_FW_LPS_ACTION:{ - bool b_enter_fwlps = *((bool *)val); - u8 rpwm_val, fw_pwrmode; - bool fw_current_inps; - - if (b_enter_fwlps) { - rpwm_val = 0x02; /* RF off */ - fw_current_inps = true; - rtlpriv->cfg->ops->set_hw_reg(hw, - HW_VAR_FW_PSMODE_STATUS, - (u8 *)(&fw_current_inps)); - rtlpriv->cfg->ops->set_hw_reg(hw, - HW_VAR_H2C_FW_PWRMODE, - (u8 *)(&ppsc->fwctrl_psmode)); - - rtlpriv->cfg->ops->set_hw_reg(hw, - HW_VAR_SET_RPWM, - (u8 *)(&rpwm_val)); - } else { - rpwm_val = 0x0C; /* RF on */ - fw_pwrmode = FW_PS_ACTIVE_MODE; - fw_current_inps = false; - rtlpriv->cfg->ops->set_hw_reg(hw, - HW_VAR_SET_RPWM, - (u8 *)(&rpwm_val)); - rtlpriv->cfg->ops->set_hw_reg(hw, - HW_VAR_H2C_FW_PWRMODE, - (u8 *)(&fw_pwrmode)); - - rtlpriv->cfg->ops->set_hw_reg(hw, - HW_VAR_FW_PSMODE_STATUS, - (u8 *)(&fw_current_inps)); - } - break; + break; } default: RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, From patchwork Fri Jan 4 12:48:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 1020721 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hotmail.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43WPkC69NHz9rxp for ; Fri, 4 Jan 2019 23:49:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727642AbfADMsw (ORCPT ); Fri, 4 Jan 2019 07:48:52 -0500 Received: from mail-oln040092068015.outbound.protection.outlook.com ([40.92.68.15]:55616 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727419AbfADMsr (ORCPT ); Fri, 4 Jan 2019 07:48:47 -0500 Received: from HE1EUR02FT009.eop-EUR02.prod.protection.outlook.com (10.152.10.58) by HE1EUR02HT037.eop-EUR02.prod.protection.outlook.com (10.152.11.189) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13; Fri, 4 Jan 2019 12:48:43 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com (10.152.10.52) by HE1EUR02FT009.mail.protection.outlook.com (10.152.10.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13 via Frontend Transport; Fri, 4 Jan 2019 12:48:43 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e]) by DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e%4]) with mapi id 15.20.1516.000; Fri, 4 Jan 2019 12:48:43 +0000 From: Bernd Edlinger To: Ping-Ke Shih , Larry Finger , Kalle Valo , "David S. Miller" , "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH 2/4] rtlwifi: rtl8723ae: Don't use dm.undec_sm_pwdb for input Thread-Topic: [PATCH 2/4] rtlwifi: rtl8723ae: Don't use dm.undec_sm_pwdb for input Thread-Index: AQHUpCvT1+c+2uBxmka7DY/xDmReoQ== Date: Fri, 4 Jan 2019 12:48:43 +0000 Message-ID: Accept-Language: en-US, en-GB, de-DE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0201CA0007.eurprd02.prod.outlook.com (2603:10a6:203:3d::17) To DB7PR07MB5353.eurprd07.prod.outlook.com (2603:10a6:10:6e::26) x-incomingtopheadermarker: OriginalChecksum:7FF6F95BF8F43FB88B0EE06F1F23CD96DE8568F90E766D091FAEE74595D553FE; UpperCasedChecksum:36EE204A8243400F94EDB64C8B3FE5235AD3139CAC65F09185BE5E1C9B00B346; SizeAsReceived:8760; Count:62 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [8YhwiYg1Y1WTAJcZkKkGWKarkZ0Anyp7] x-microsoft-original-message-id: <40ae95c0-f706-c32f-9790-7014302ac62c@hotmail.de> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR02HT037; 6:ytd0B6lm5dM99ou53zQ27eJiS95ab+FHFylIeleJ4HDI83l+Fthtun3b+U8xRMnuybkEdKkU1ln1Hw04I9QQOZsVrZXGdN0HQXIqO8natblsk+cRvc7AZ76CswbMgaPchjzzE0V6Pah1vN2UqT+1zhMPuD8kDjFHak+i1Ynx6m5JlSx1gJG2beZnMUOXEMnsWzj1Q7eND82R5OSENdLS6nB3w2s3hRRidBu+EBKg1DYJoSY72MU7wyt3fP+FQuSCn9iBmGQVzGE83rGe+bGKlwok2t73WIYu6XNtPsRfgzqSkIDVVcba6hYJeKUKgTxU92UxUN+err+C7A9IJ+3Q6cDF1Dt4pLnsQbgFE9nChscw9TFAJZ8pBv+u0t9ktX7PPJHkfkoIQdp0NA5tEoD82QgK+DzgdhmdDzhBWxb2zwt6yAHW1gR8ww6r6ew4GSKWpNez9JdiARHoNoh581w4Cg==; 5:PoJ/Sm7dT53OhjbWteHTorlCUkmbiz2qsYu1fZ9TPmmIk2i06pdyLCr/s9oQNw6rlt5sutw24P2ZJ7qgWnH/pDvPx9HxN0kY/vDQKjBFsYjKyvLUZEqXsz68zaDf+xDcFtf316lPONnzekXj+GSeQtEmmqe44snBuo52++Egy+4=; 7:3L0Ec6JBEQOEP5FgTCILX66b9pCS9kIwjJHmsZjeJaOWZ2JNup7IwRoXGnbE03GJfYuT17l/zU5m1B4byEkIpyOxKPiY2VRdUtkVNGLcQJ/cTufsepxSotmm13sy4xZI+YVdZYZSfXWuWvAh4TqQdw== x-incomingheadercount: 62 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:HE1EUR02HT037; x-ms-traffictypediagnostic: HE1EUR02HT037: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:HE1EUR02HT037; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR02HT037; x-microsoft-antispam-message-info: gOq9NOHygEDB5ZIaEATJOFuxOQEdSyFyYsJ8I6VMAsLem0xKswXfhLGE3DMlJe/5 Content-ID: <4092DC23D88AEB4E9DEDD6032D2DE2FC@eurprd07.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-Network-Message-Id: e949bbd2-4586-4505-8bc2-08d67242f5a3 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jan 2019 12:48:42.9516 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT037 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org gain control when no beacon was received in the connected state. This avoids sporadic "Connection to AP ... lost" errors. Signed-off-by: Bernd Edlinger --- drivers/net/wireless/realtek/rtlwifi/core.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c index 4bf7967..ce23339 100644 --- a/drivers/net/wireless/realtek/rtlwifi/core.c +++ b/drivers/net/wireless/realtek/rtlwifi/core.c @@ -1957,5 +1957,7 @@ void rtl_dm_diginit(struct ieee80211_hw *hw, u32 cur_igvalue) dm_digtable->bt30_cur_igi = 0x32; dm_digtable->pre_cck_pd_state = CCK_PD_STAGE_MAX; dm_digtable->cur_cck_pd_state = CCK_PD_STAGE_LOWRSSI; + dm_digtable->pre_cck_fa_state = 0; + dm_digtable->cur_cck_fa_state = 0; } EXPORT_SYMBOL(rtl_dm_diginit); diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c index 42a6fba..902b944 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c @@ -151,8 +151,14 @@ static u8 rtl8723e_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw) { struct rtl_priv *rtlpriv = rtl_priv(hw); struct dig_t *dm_digtable = &rtlpriv->dm_digtable; + struct rtl_mac *mac = rtl_mac(rtlpriv); long rssi_val_min = 0; + if (mac->link_state == MAC80211_LINKED && + mac->opmode == NL80211_IFTYPE_STATION && + rtlpriv->link_info.bcn_rx_inperiod == 0) + return 0; + if ((dm_digtable->curmultista_cstate == DIG_MULTISTA_CONNECT) && (dm_digtable->cursta_cstate == DIG_STA_CONNECT)) { if (rtlpriv->dm.entry_min_undec_sm_pwdb != 0) @@ -417,6 +423,8 @@ static void rtl8723e_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw) } else { rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2, 0xcd); rtl_set_bbreg(hw, RCCK0_SYSTEM, MASKBYTE1, 0x47); + dm_digtable->pre_cck_fa_state = 0; + dm_digtable->cur_cck_fa_state = 0; } dm_digtable->pre_cck_pd_state = dm_digtable->cur_cck_pd_state; From patchwork Fri Jan 4 12:48:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 1020720 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hotmail.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43WPk35x4jz9s7T for ; Fri, 4 Jan 2019 23:49:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727419AbfADMsz (ORCPT ); Fri, 4 Jan 2019 07:48:55 -0500 Received: from mail-oln040092068057.outbound.protection.outlook.com ([40.92.68.57]:23199 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727609AbfADMsy (ORCPT ); Fri, 4 Jan 2019 07:48:54 -0500 Received: from HE1EUR02FT009.eop-EUR02.prod.protection.outlook.com (10.152.10.52) by HE1EUR02HT213.eop-EUR02.prod.protection.outlook.com (10.152.10.206) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13; Fri, 4 Jan 2019 12:48:49 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com (10.152.10.52) by HE1EUR02FT009.mail.protection.outlook.com (10.152.10.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13 via Frontend Transport; Fri, 4 Jan 2019 12:48:49 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e]) by DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e%4]) with mapi id 15.20.1516.000; Fri, 4 Jan 2019 12:48:49 +0000 From: Bernd Edlinger To: Ping-Ke Shih , Larry Finger , Kalle Valo , "David S. Miller" , "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH 3/4] rtlwifi: rtl8723ae: Re-introduce Thread-Topic: [PATCH 3/4] rtlwifi: rtl8723ae: Re-introduce Thread-Index: AQHUpCvWT8DRnoOfM0CRszihJH29JQ== Date: Fri, 4 Jan 2019 12:48:49 +0000 Message-ID: Accept-Language: en-US, en-GB, de-DE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0201CA0013.eurprd02.prod.outlook.com (2603:10a6:203:3d::23) To DB7PR07MB5353.eurprd07.prod.outlook.com (2603:10a6:10:6e::26) x-incomingtopheadermarker: OriginalChecksum:9474B23F583E25E7959C1C8096CEEA2B412F78BA1A60E1FE9A4A3FBAB225220D; UpperCasedChecksum:3FF472842AE3ECDE5F7E2D003490E917DECE08477FE46DB17321900323BA6176; SizeAsReceived:8719; Count:62 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [O7Cy9wEpT/elZd5WiDEL/Gp/jVUh1not] x-microsoft-original-message-id: <13ef8d5e-cd1b-6c99-3314-61daf0b71c2b@hotmail.de> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR02HT213; 6:jaK26lQP/GpJq/ALVGZYCIJVqo4Oj2DNqWHpY2U1TDPlCkqvkUpxkXZn9SiLO7Dm46lFmRfCuDlVrKNPPwRC9o4NcpGhN2NRGjMy1MaCdBWBkOc4bdMYkV17nos2zfU8NAUKTpjMcuhy4wc+glaGwXvP2Hj3wly7VYf5sC1jb5Nbs62mOWRQYF9yDG4U0baTxctNdQuWYqEkx/8snG7asEMuxSzqRKDvxdY7xM0J+3iGklZMY8Ry351s9hVqq4MzuoGORHfwU9BW12aOu1ov7tyigjBl4p9UnqS6XX30o/2DBMmirZXn1RsE/E3bsYvuMuKe4Jtnv3HAnAGYCx4vHSlG52S+PCmostaqlILEzF/NGInB+MFwn71gyaSjzZ4ZFXtcSGVZ51T/gjWE1LzFtHGljcuVcPvht/PSg+IP9xNlp/Q4J4vfhfCmy9LgLVz/zv7aRVEL+wIIIoWPYI3S5A==; 5:OgmgdKqu//BQ35Ekao7fQ04HwRNha6gqt6I/NaEGGEZ55VY59U/G/6UAY3BgY+JS9sNHVYPxpkdTsZf/rQYWHM/Jjf6vofT7f1p4GITxGluDxBuU1lS7JlD7pKkxiT4oMfbBK4fb8lxDg9P0rybya03bzMoBSExWXNp89WNqeCk=; 7:1rf0n8BsC5s0oUDUCtYOj8J5nEMMyQZh++6hkFjhsjjyu5dfI2eyrp5Zgs9pQbHzWKrRIJhE+pr8YkC6IZyanQWIQcULbBpwWkGI5V9JPAmwrjoe3Rl59UFoiYfarTJ/E2Fei8Gl721ikK+eUkXB3A== x-incomingheadercount: 62 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:HE1EUR02HT213; x-ms-traffictypediagnostic: HE1EUR02HT213: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:HE1EUR02HT213; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR02HT213; x-microsoft-antispam-message-info: OSg8NWfaut9OuyJusqKxGzzZrO1yEngao0QibDXJtnWrTQK3eN72gVHYPdsoSINM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-Network-Message-Id: 1cbd7e98-5679-4dc4-ca94-08d67242f8ea X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jan 2019 12:48:48.4048 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT213 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtl8723e_dm_refresh_rate_adaptive_mask This function was present in a previous version of the code base, it works just fine for me -- as long as it is not using stale data. Fixed a style nit in rtl8723e_dm_init_rate_adaptive_mask. Signed-off-by: Bernd Edlinger --- .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 87 +++++++++++++++++++++- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c index 902b944..acfd54c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c @@ -673,7 +673,7 @@ void rtl8723e_dm_check_txpower_tracking(struct ieee80211_hw *hw) void rtl8723e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw) { struct rtl_priv *rtlpriv = rtl_priv(hw); - struct rate_adaptive *p_ra = &(rtlpriv->ra); + struct rate_adaptive *p_ra = &rtlpriv->ra; p_ra->ratr_state = DM_RATR_STA_INIT; p_ra->pre_ratr_state = DM_RATR_STA_INIT; @@ -685,6 +685,89 @@ void rtl8723e_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw) } +void rtl8723e_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw) +{ + struct rtl_priv *rtlpriv = rtl_priv(hw); + struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); + struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); + struct rate_adaptive *p_ra = &rtlpriv->ra; + u32 low_rssithresh_for_ra, high_rssithresh_for_ra; + struct ieee80211_sta *sta = NULL; + + if (is_hal_stop(rtlhal)) { + RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, + " driver is going to unload\n"); + return; + } + + if (!rtlpriv->dm.useramask) { + RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, + " driver does not control rate adaptive mask\n"); + return; + } + + if (mac->link_state == MAC80211_LINKED && + mac->opmode == NL80211_IFTYPE_STATION) { + switch (p_ra->pre_ratr_state) { + case DM_RATR_STA_HIGH: + high_rssithresh_for_ra = 50; + low_rssithresh_for_ra = 20; + break; + case DM_RATR_STA_MIDDLE: + high_rssithresh_for_ra = 55; + low_rssithresh_for_ra = 20; + break; + case DM_RATR_STA_LOW: + high_rssithresh_for_ra = 60; + low_rssithresh_for_ra = 25; + break; + default: + high_rssithresh_for_ra = 50; + low_rssithresh_for_ra = 20; + break; + } + + if (rtlpriv->link_info.bcn_rx_inperiod == 0) + switch (p_ra->pre_ratr_state) { + case DM_RATR_STA_HIGH: + default: + p_ra->ratr_state = DM_RATR_STA_MIDDLE; + break; + case DM_RATR_STA_MIDDLE: + case DM_RATR_STA_LOW: + p_ra->ratr_state = DM_RATR_STA_LOW; + break; + } + else if (rtlpriv->dm.undec_sm_pwdb > high_rssithresh_for_ra) + p_ra->ratr_state = DM_RATR_STA_HIGH; + else if (rtlpriv->dm.undec_sm_pwdb > low_rssithresh_for_ra) + p_ra->ratr_state = DM_RATR_STA_MIDDLE; + else + p_ra->ratr_state = DM_RATR_STA_LOW; + + if (p_ra->pre_ratr_state != p_ra->ratr_state) { + RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, + "RSSI = %ld\n", + rtlpriv->dm.undec_sm_pwdb); + RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, + "RSSI_LEVEL = %d\n", p_ra->ratr_state); + RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, + "PreState = %d, CurState = %d\n", + p_ra->pre_ratr_state, p_ra->ratr_state); + + rcu_read_lock(); + sta = rtl_find_sta(hw, mac->bssid); + if (sta) + rtlpriv->cfg->ops->update_rate_tbl(hw, sta, + p_ra->ratr_state, + true); + rcu_read_unlock(); + + p_ra->pre_ratr_state = p_ra->ratr_state; + } + } +} + void rtl8723e_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal) { struct rtl_priv *rtlpriv = rtl_priv(hw); @@ -834,7 +917,7 @@ void rtl8723e_dm_watchdog(struct ieee80211_hw *hw) rtl8723e_dm_dynamic_bb_powersaving(hw); rtl8723e_dm_dynamic_txpower(hw); rtl8723e_dm_check_txpower_tracking(hw); - /* rtl92c_dm_refresh_rate_adaptive_mask(hw); */ + rtl8723e_dm_refresh_rate_adaptive_mask(hw); rtl8723e_dm_bt_coexist(hw); rtl8723e_dm_check_edca_turbo(hw); } From patchwork Fri Jan 4 12:48:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 1020719 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hotmail.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43WPjq199dz9s9h for ; Fri, 4 Jan 2019 23:49:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727923AbfADMs7 (ORCPT ); Fri, 4 Jan 2019 07:48:59 -0500 Received: from mail-oln040092069093.outbound.protection.outlook.com ([40.92.69.93]:27370 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727866AbfADMs5 (ORCPT ); Fri, 4 Jan 2019 07:48:57 -0500 Received: from HE1EUR02FT009.eop-EUR02.prod.protection.outlook.com (10.152.10.57) by HE1EUR02HT232.eop-EUR02.prod.protection.outlook.com (10.152.11.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13; Fri, 4 Jan 2019 12:48:54 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com (10.152.10.52) by HE1EUR02FT009.mail.protection.outlook.com (10.152.10.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13 via Frontend Transport; Fri, 4 Jan 2019 12:48:54 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e]) by DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e%4]) with mapi id 15.20.1516.000; Fri, 4 Jan 2019 12:48:54 +0000 From: Bernd Edlinger To: Ping-Ke Shih , Larry Finger , Kalle Valo , "David S. Miller" , "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH 4/4] rtlwifi: Move the clearing of Thread-Topic: [PATCH 4/4] rtlwifi: Move the clearing of Thread-Index: AQHUpCvZ4dH6TVfU7U+vmVR8cxtIDg== Date: Fri, 4 Jan 2019 12:48:54 +0000 Message-ID: Accept-Language: en-US, en-GB, de-DE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0201CA0008.eurprd02.prod.outlook.com (2603:10a6:203:3d::18) To DB7PR07MB5353.eurprd07.prod.outlook.com (2603:10a6:10:6e::26) x-incomingtopheadermarker: OriginalChecksum:3C39BD1289A656C54944821A3136053D1A2C7ADDEC29E393109A665E07ACF9F6; UpperCasedChecksum:615E02205D2A157478AD46069295F34B15EA333074208519A4E25A1C1A7D4845; SizeAsReceived:8713; Count:62 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [pO5RHo1UyCmnsio6C6oj8MCv4iRowUsf] x-microsoft-original-message-id: <72b5e285-e32c-6cd3-12c8-cba92e84757f@hotmail.de> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR02HT232; 6:GXIfkTwBrG9PzVY+tgItMSvGDDcNsYXO1csfe7/u3QQNzFwovf4sbP6Mn53PMXVEeEpu4sF7UISaiuGk9gfy7WhOP7dSMDw7lJt3vzAMFTXSB5DFrpSbv9IdHGxl89ifTTYtGmP8B8vAY3GwUyvZxnzHr113TUS7z+pw9ODtKqubIr5m+xOS/hIrPSOcvzFlD5559cbOKdnk7Er9EybSSPVb7IDXi+dwGdwRFaM3qPpSLqztrW68kS0E8QNeZTCp+uRJZWk3nMHmBCLRNq5y0Vou2r5zbiFs4NEN9SXwlySuHd8kUeZ/E2+dt8t/Su2uOqrn8qUhzjlfH90I5HFsk4TNH4DVbeGKiYl5w4LwQZbNhl6mHKWTbDjz4/PqnWR+J6ZYZaut2WS8w+70cqzpoQNtugzsIzNb7RWAzxgA8Pzj5iEjdsGzCJ6mLnR9cz8P+roFAUJE1T+I/zmgtgBtWg==; 5:ke9WjBB4xbHQ3qNf8myKygEY351MwMFIhOvAO8cAGao5DHKnbUD3wAiP/lG6rfiM19GdEm5tn2Ihov2VYkwzhOUaxXhisKDXDRpbNUcXGjIPh8apti6Fepldkzzsk4/smMbXu92TlRid866SuzxTaZMAWFyKjJymvh+KYX+O33U=; 7:SXguYxpsipqzcgJ06zrYT9kiWEZ9o1E20L7grDNimO9Jt9qKW2LQrKYDgag09w0Xarlk53ZAxvQ3tr5ELMtyu6apQ0RIbD7KoTPJZRsdCwveYF88/6/zFTHBnge0d9sVaTLc6TswmFYTUOYccj/KMA== x-incomingheadercount: 62 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(20181119063)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:HE1EUR02HT232; x-ms-traffictypediagnostic: HE1EUR02HT232: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:HE1EUR02HT232; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR02HT232; x-microsoft-antispam-message-info: hd4FBW53lJRWHo+4t0ZLGj4eCieIkpz+L47CFljiiHAeXJSRTM5za/xxf4cilFXY Content-ID: <170368D54D74E343BC086CD382054187@eurprd07.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-Network-Message-Id: c033053e-2962-455d-307a-08d67242fc39 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jan 2019 12:48:53.9674 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT232 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtlpriv->link_info.num_rx_inperiod in rtl_watchdog_wq_callback a few lines down. This is necessary since it is still used in the "AP off" detection code block. Moved clearing of rtlpriv->link_info.num_rx_inperiod as well for consistency. Signed-off-by: Bernd Edlinger --- drivers/net/wireless/realtek/rtlwifi/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index ef9b502..7aa68fe 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -2172,8 +2172,6 @@ void rtl_watchdog_wq_callback(void *data) ; } - rtlpriv->link_info.num_rx_inperiod = 0; - rtlpriv->link_info.num_tx_inperiod = 0; for (tid = 0; tid <= 7; tid++) rtlpriv->link_info.tidtx_inperiod[tid] = 0; @@ -2236,6 +2234,8 @@ void rtl_watchdog_wq_callback(void *data) rtlpriv->btcoexist.btc_info.in_4way = false; } + rtlpriv->link_info.num_rx_inperiod = 0; + rtlpriv->link_info.num_tx_inperiod = 0; rtlpriv->link_info.bcn_rx_inperiod = 0; /* <6> scan list */