From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BC854468BF; Tue, 10 Jun 2025 09:41:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8B0B42E69; Tue, 10 Jun 2025 09:40:57 +0200 (CEST) Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) by mails.dpdk.org (Postfix) with ESMTP id B51EB42E57 for ; Tue, 10 Jun 2025 09:40:53 +0200 (CEST) X-SpamFilter-By: ArmorX SpamTrap 5.80 with qID 55A7eo2K32458254, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=realsil.com.cn; s=dkim; t=1749541251; bh=KDSjQ6eLxM0ZS4CwUM+3aZH0/Kt9/gOJybGjMRHRLh8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=KfB68bKsOMhVJ+qiSLKTKeYu8Wz2zbuW5bfyDytXSY2WlJEc8Wz6Dr9bwkZVz8wdc hIFzgx19Pyq2wQlKYLsB4EgPwMSXT6b6zjWpU37ev0YEsBWJ2VdIXQ8kzURsADWJXW XFxMnb0BP34mIFo3KHA3r8f91g0GPTEhsCmeP6zNp95NUOo/gaRBSL9th8NC8im3Fh PP5yO2nb5dfMfozE84wbTcYA11Yutb+OBmaM8D1tQ7xWkUeXwV6+291SMIEtXufM8t Jz8AKE9Ir9wqA6ysZ+oBoK3HzCDGIlRfKrsCtOOdMiqg8Lc3pZoSKQYQBWdHvniyyI Zb35GOP/MGtqA== Received: from RS-EX-MBS3.realsil.com.cn ([172.29.17.103]) by rtits2.realtek.com.tw (8.15.2/3.13/5.93) with ESMTPS id 55A7eo2K32458254 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 10 Jun 2025 15:40:51 +0800 Received: from RS-EX-MBS2.realsil.com.cn (172.29.17.102) by RS-EX-MBS3.realsil.com.cn (172.29.17.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 10 Jun 2025 15:40:51 +0800 Received: from 172.29.32.27 (172.29.32.27) by RS-EX-MBS2.realsil.com.cn (172.29.17.102) with Microsoft SMTP Server id 15.2.1544.11 via Frontend Transport; Tue, 10 Jun 2025 15:40:51 +0800 From: Howard Wang To: CC: , Howard Wang Subject: [PATCH v2 4/8] net/r8169: remove cmac feature for RTL8125AP Date: Tue, 10 Jun 2025 15:40:33 +0800 Message-ID: <20250610074037.5288-5-howard_wang@realsil.com.cn> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250610074037.5288-1-howard_wang@realsil.com.cn> References: <20250610074037.5288-1-howard_wang@realsil.com.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Signed-off-by: Howard Wang --- drivers/net/r8169/r8169_dash.c | 23 +++++++++++------------ drivers/net/r8169/r8169_dash.h | 1 + 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/r8169/r8169_dash.c b/drivers/net/r8169/r8169_dash.c index 0da7e07283..a225af7e27 100644 --- a/drivers/net/r8169/r8169_dash.c +++ b/drivers/net/r8169/r8169_dash.c @@ -63,18 +63,23 @@ _rtl_check_dash(struct rtl_hw *hw) if (!hw->AllowAccessDashOcp) return 0; - if (HW_DASH_SUPPORT_TYPE_2(hw) || HW_DASH_SUPPORT_TYPE_3(hw) || - HW_DASH_SUPPORT_TYPE_4(hw)) { + switch (hw->HwSuppDashVer) { + case 2: + if (rtl_is_8125(hw)) + return 0; + /* Fall through */ + case 3: + case 4: if (rtl_ocp_read(hw, 0x128, 1) & BIT_0) return 1; else return 0; - } else if (HW_DASH_SUPPORT_TYPE_1(hw)) { + case 1: if (rtl_ocp_read(hw, 0x10, 2) & 0x00008000) return 1; else return 0; - } else { + default: return 0; } } @@ -193,7 +198,7 @@ rtl8168_csi_to_cmac_w8(struct rtl_hw *hw, u32 reg, u8 value) static void rtl_cmac_w8(struct rtl_hw *hw, u32 reg, u8 value) { - if (HW_DASH_SUPPORT_TYPE_2(hw) || HW_DASH_SUPPORT_TYPE_4(hw)) + if (HW_DASH_SUPPORT_TYPE_2(hw)) RTL_CMAC_W8(hw, reg, value); else if (HW_DASH_SUPPORT_TYPE_3(hw)) rtl8168_csi_to_cmac_w8(hw, reg, value); @@ -202,7 +207,7 @@ rtl_cmac_w8(struct rtl_hw *hw, u32 reg, u8 value) static u8 rtl_cmac_r8(struct rtl_hw *hw, u32 reg) { - if (HW_DASH_SUPPORT_TYPE_2(hw) || HW_DASH_SUPPORT_TYPE_4(hw)) + if (HW_DASH_SUPPORT_TYPE_2(hw)) return RTL_CMAC_R8(hw, reg); else if (HW_DASH_SUPPORT_TYPE_3(hw)) return rtl8168_csi_to_cmac_r8(hw, reg); @@ -270,9 +275,6 @@ rtl8125_notify_dash_oob_cmac(struct rtl_hw *hw, u32 cmd) static void rtl8125_notify_dash_oob_ipc2(struct rtl_hw *hw, u32 cmd) { - if (!HW_DASH_SUPPORT_TYPE_4(hw)) - return; - rtl_ocp_write(hw, IB2SOC_DATA, 4, cmd); rtl_ocp_write(hw, IB2SOC_CMD, 4, 0x00); rtl_ocp_write(hw, IB2SOC_SET, 4, 0x01); @@ -554,9 +556,6 @@ rtl8125_driver_stop(struct rtl_hw *hw) if (!hw->AllowAccessDashOcp) return; - if (HW_DASH_SUPPORT_CMAC(hw)) - rtl_dash2_disable_txrx(hw); - rtl8125_notify_dash_oob(hw, OOB_CMD_DRIVER_STOP); rtl_wait_dash_fw_ready(hw); diff --git a/drivers/net/r8169/r8169_dash.h b/drivers/net/r8169/r8169_dash.h index 47c5d6906e..7c31658573 100644 --- a/drivers/net/r8169/r8169_dash.h +++ b/drivers/net/r8169/r8169_dash.h @@ -20,6 +20,7 @@ #define HW_DASH_SUPPORT_TYPE_3(_M) ((_M)->HwSuppDashVer == 3) #define HW_DASH_SUPPORT_TYPE_4(_M) ((_M)->HwSuppDashVer == 4) #define HW_DASH_SUPPORT_CMAC(_M) (HW_DASH_SUPPORT_TYPE_2(_M) || HW_DASH_SUPPORT_TYPE_3(_M)) +#define HW_DASH_SUPPORT_IPC2(_M) (HW_DASH_SUPPORT_TYPE_4(_M)) #define HW_DASH_SUPPORT_GET_FIRMWARE_VERSION(_M) (HW_DASH_SUPPORT_TYPE_2(_M) || \ HW_DASH_SUPPORT_TYPE_3(_M) || \ HW_DASH_SUPPORT_TYPE_4(_M)) -- 2.34.1