Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp1800672rwr; Fri, 28 Apr 2023 01:56:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ezw+As62kpBCpNnvYzS83ZstEuO0SAI4Lmdj+1ZUx8+6VBEiba6jXQ1+raLqbwfZ/LwE7 X-Received: by 2002:a05:6a20:431b:b0:ef:acca:9e19 with SMTP id h27-20020a056a20431b00b000efacca9e19mr5817263pzk.14.1682672164916; Fri, 28 Apr 2023 01:56:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682672164; cv=none; d=google.com; s=arc-20160816; b=pPqWIX71WhAmRDvSsh6BfHekZYIrRLoHTBsnu5lc0oTGvOVrQTW3oGcG34zySkman3 7qdv2HS6iyeqeSHZbpI75ngLO+1vZi2FhhMhh24NQNMl5Lefc+64xK8kwxCT9/rJ0lPN uall1XYDBMbJhEiciO9l8IfaZ+7caayNOOoayKgx8BoADlHpOOSVZH3whVcHNYz1rMND 3uCpnuVnU8tkTajgcykP8/iwuWrM6080ev/Xe4qgTE3ANmo8dTmCW89lGQ/DPyPG094A PbG22OjSlqyZPayveJw8HVKpbPWbWQmfM3hKpzQNtU1+hF+StYv/OVAhdxT/sry94fUM Augg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :authenticated-by; bh=XdZRgboAIskK486QdD/tgL2gyBwW8gxCRwft7M0Zmtk=; b=xMTUS2dMDCqPn/jTUCHykixAKadNtKEly6kgNJwhu2wr+N16bhkvIFol6Uf02lKf7G p/bKDPXXFc8MtKtP7ka/KHa/eI+geabG488SjJ9756ekvWAmUf0qUdwCj8+OdOY3R3oh 0D/sRbids5cxxBMQI5ri/piFXrMhcub6rDwsCyHFXHSinGtfpGjCvwPbn1AXPSpH5J3c GygCbBkOK0TpBONybdjJHX39RL6+nxuX5DJ17OUd+N0haw8UcJwMdr22zS2dfaDQqFls 2WtL6zy5ZD45zKFeuzpWGILEGVW2lnOTTMfdUK5EavhF9M2Xm+KLKC6liHPoA4KJqXG4 Ry1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d5-20020a63ed05000000b0050fbc594e1asi19539294pgi.207.2023.04.28.01.55.52; Fri, 28 Apr 2023 01:56:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345747AbjD1Izq (ORCPT + 99 others); Fri, 28 Apr 2023 04:55:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345727AbjD1IzV (ORCPT ); Fri, 28 Apr 2023 04:55:21 -0400 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C8CC5FC4; Fri, 28 Apr 2023 01:54:48 -0700 (PDT) Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.77 with qID 33S8rkMrB023977, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/2.81/5.90) with ESMTPS id 33S8rkMrB023977 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK); Fri, 28 Apr 2023 16:53:46 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Fri, 28 Apr 2023 16:53:48 +0800 Received: from fc34.localdomain (172.22.228.98) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Fri, 28 Apr 2023 16:53:48 +0800 From: Hayes Wang To: , CC: , , , , Hayes Wang Subject: [PATCH net v3 3/3] r8152: move setting r8153b_rx_agg_chg_indicate() Date: Fri, 28 Apr 2023 16:53:31 +0800 Message-ID: <20230428085331.34550-412-nic_swsd@realtek.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230428085331.34550-409-nic_swsd@realtek.com> References: <20230428085331.34550-409-nic_swsd@realtek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [172.22.228.98] X-ClientProxiedBy: RTEXH36505.realtek.com.tw (172.21.6.25) To RTEXMBS04.realtek.com.tw (172.21.6.97) X-KSE-ServerInfo: RTEXMBS04.realtek.com.tw, 9 X-KSE-AntiSpam-Interceptor-Info: fallback X-KSE-Antivirus-Interceptor-Info: fallback X-KSE-AntiSpam-Interceptor-Info: fallback X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move setting r8153b_rx_agg_chg_indicate() for 2.5G devices. The r8153b_rx_agg_chg_indicate() has to be called after enabling tx/rx. Otherwise, the coalescing settings are useless. Fixes: 195aae321c82 ("r8152: support new chips") Signed-off-by: Hayes Wang --- drivers/net/usb/r8152.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 58670a65b840..755b0f72dd44 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3027,12 +3027,16 @@ static int rtl_enable(struct r8152 *tp) ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, ocp_data); switch (tp->version) { - case RTL_VER_08: - case RTL_VER_09: - case RTL_VER_14: - r8153b_rx_agg_chg_indicate(tp); + case RTL_VER_01: + case RTL_VER_02: + case RTL_VER_03: + case RTL_VER_04: + case RTL_VER_05: + case RTL_VER_06: + case RTL_VER_07: break; default: + r8153b_rx_agg_chg_indicate(tp); break; } @@ -3086,7 +3090,6 @@ static void r8153_set_rx_early_timeout(struct r8152 *tp) 640 / 8); ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EXTRA_AGGR_TMR, ocp_data); - r8153b_rx_agg_chg_indicate(tp); break; default: @@ -3120,7 +3123,6 @@ static void r8153_set_rx_early_size(struct r8152 *tp) case RTL_VER_15: ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, ocp_data / 8); - r8153b_rx_agg_chg_indicate(tp); break; default: WARN_ON_ONCE(1); -- 2.40.0