From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DB6940B0F3; Thu, 3 Sep 2026 07:29:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788420577; cv=none; b=a0gWCb+dq8lMqNmqH7ye3sXoBuSoLjCuhASCGTXL6vrsAtX3DjelcAbSyESgT/atY2WaIbNArIpwQRUJamwpHJ/sQi8uRU82Afm39QsFx8e5pdr/yObKTZYJHjmFXoYt971r9iU3iKPatk7L9VtX0IbCiiTK/8a3YydEdvn9iuE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788420577; c=relaxed/simple; bh=Wht7oAcrZBX3fbhIKr3nuTcCjgWjxPLa2yKTKhhkRmw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=K8qgciGZjsM44yl5QU5y3xLAfQsAykfsRenq+WIEdR9538JHdI8B83xf88d5SDRuie3+p0xoKIEFFGqS6weQIwxMhxpK08ItANHeHsn4Eow+3X0LR2ggNAxjiocGlVlYCGPd+P2XX9s9OanD3Hqi2wv7Tmu5fJ/BqoUAT0/PCh4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=pass (2048-bit key) header.d=realtek.com header.i=@realtek.com header.b=Rv0dJWx5; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=realtek.com header.i=@realtek.com header.b="Rv0dJWx5" X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 6837StxzE3295537, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realtek.com; s=dkim; t=1788420535; bh=csTyRDsdL61cSbQucEs1wuNlWyrzKP3hlpPQcj2MlTU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=Rv0dJWx5gkkTTt21DoLj4ee83q/Q1ZNSmPncpGrzuIVIu5Q4nBWxbG/sfc6Of2bVT UGR11o6Tr7QRNGD+DXWr5PJKHVG/st33UO5O/bLLQ2zPy3vOJmW9sencNWMxRJpo3h wFFQ3N7hSh4KcdmB2nlfn8HXXYqQhBXLAJAdHEmd7Ho53f7Y3Om4QPFSVEW1eKQylK miVEkwB7duIXZ473mHXsC5Udgmu9lZd36r8msBWEa/n3EIR8L4VaBXHmotT78Gn4el 1p2LrDDzP9Sl59IQYatEgZxJHjcFzl5MnvyECDehePchRv9i2+j3LNH+Da3Ry797b4 hwFARg65Fr7Fw== Received: from mail.realtek.com (rtkexhmbs04.realtek.com.tw[10.21.1.54]) by rtits2.realtek.com.tw (8.15.2/3.29/5.94) with ESMTPS id 6837StxzE3295537 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 3 Sep 2026 15:28:55 +0800 Received: from RTKEXHMBS04.realtek.com.tw (10.21.1.54) by RTKEXHMBS04.realtek.com.tw (10.21.1.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.43; Thu, 3 Sep 2026 15:28:54 +0800 Received: from fc44.realtek.com.tw (172.22.241.7) by RTKEXHMBS04.realtek.com.tw (10.21.1.54) with Microsoft SMTP Server id 15.2.2562.43 via Frontend Transport; Thu, 3 Sep 2026 15:28:54 +0800 From: Chih Kai Hsu To: , CC: , , , , , , , , Subject: [PATCH net-next v2 5/8] r8152: support rtl8157_unload and rtl8157_change_mtu Date: Thu, 3 Sep 2026 15:28:49 +0800 Message-ID: <20260903072852.58695-6-nic_swsd@realtek.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260903072852.58695-1-nic_swsd@realtek.com> References: <20260903072852.58695-1-nic_swsd@realtek.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain RTL8157 and RTL8159 need a dedicated unload callback to disable interrupt mitigation and use r8157_power_cut_en instead of r8153_power_cut_en. They also need a dedicated change_mtu that scales MTPS between 10K and 16K depending on the MTU, unlike rtl8156_change_mtu which uses a fixed MTPS. Signed-off-by: Chih Kai Hsu --- drivers/net/usb/r8152.c | 47 ++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 00bd3afe79033..1bf465b1cacb3 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -7031,6 +7031,28 @@ static void rtl8156_down(struct r8152 *tp) r8153_aldps_en(tp, true); } +static void rtl8157_change_mtu(struct r8152 *tp) +{ + u32 max_pkt_size = mtu_to_size(tp->netdev->mtu); + u32 ocp_data; + + ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, max_pkt_size); + + /* Use at least 10K for MTPS */ + ocp_data = max_t(u32, max_pkt_size, 10 * 1024) / 64; + + /* 16 * 1024 / 64 = 0x100, so the max is 0xff for 8 bits data */ + ocp_data = min_t(u32, ocp_data, 0xff); + + ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, ocp_data); + r8156_fc_parameter(tp); + + /* TX share fifo free credit full threshold */ + ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, 512 / 64); + ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_FULL, + ALIGN(max_pkt_size + tp->tx_desc.size, 1024) / 16); +} + static void rtl8157_up(struct r8152 *tp) { if (test_bit(RTL8152_INACCESSIBLE, &tp->flags)) @@ -7055,7 +7077,7 @@ static void rtl8157_up(struct r8152 *tp) rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); - rtl8156_change_mtu(tp); + rtl8157_change_mtu(tp); /* share FIFO settings */ ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, RXFIFO_FULL_MASK, @@ -10187,11 +10209,6 @@ static void rtl8153_unload(struct r8152 *tp) return; r8153_power_cut_en(tp, false); - - if (tp->version >= RTL_VER_16) { - /* Disable Interrupt Mitigation */ - ocp_byte_clr_bits(tp, MCU_TYPE_USB, 0xcf04, BIT(0) | BIT(1) | BIT(2) | BIT(7)); - } } static void rtl8153b_unload(struct r8152 *tp) @@ -10202,6 +10219,16 @@ static void rtl8153b_unload(struct r8152 *tp) r8153b_power_cut_en(tp, false); } +static void rtl8157_unload(struct r8152 *tp) +{ + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags)) + return; + + r8157_power_cut_en(tp, false); + ocp_byte_clr_bits(tp, MCU_TYPE_USB, 0xcf04, + BIT(0) | BIT(1) | BIT(2) | BIT(7)); +} + static int r8152_desc_init(struct r8152 *tp) { tp->rx_desc.size = sizeof(struct rx_desc); @@ -10380,13 +10407,13 @@ static int rtl_ops_init(struct r8152 *tp) ops->disable = rtl8153_disable; ops->up = rtl8157_up; ops->down = rtl8157_down; - ops->unload = rtl8153_unload; + ops->unload = rtl8157_unload; ops->eee_get = r8153_get_eee; ops->eee_set = r8152_set_eee; ops->in_nway = rtl8153_in_nway; ops->hw_phy_cfg = r8157_hw_phy_cfg; ops->autosuspend_en = rtl8157_runtime_enable; - ops->change_mtu = rtl8156_change_mtu; + ops->change_mtu = rtl8157_change_mtu; tp->rx_buf_sz = 32 * 1024; tp->support_2500full = 1; tp->support_5000full = 1; @@ -10403,13 +10430,13 @@ static int rtl_ops_init(struct r8152 *tp) ops->disable = rtl8153_disable; ops->up = rtl8157_up; ops->down = rtl8157_down; - ops->unload = rtl8153_unload; + ops->unload = rtl8157_unload; ops->eee_get = r8153_get_eee; ops->eee_set = r8152_set_eee; ops->in_nway = rtl8153_in_nway; ops->hw_phy_cfg = r8159_hw_phy_cfg; ops->autosuspend_en = rtl8157_runtime_enable; - ops->change_mtu = rtl8156_change_mtu; + ops->change_mtu = rtl8157_change_mtu; tp->rx_buf_sz = 48 * 1024; tp->support_2500full = 1; tp->support_5000full = 1; -- 2.34.1