From: Heiner Kallweit <hkallweit1@gmail•com>
To: ChunHao Lin <hau@realtek•com>
Cc: netdev@vger•kernel.org, nic_swsd@realtek•com
Subject: Re: [PATCH net 1/2] r8169: add handling DASH when DASH is disabled
Date: Tue, 7 Nov 2023 08:12:36 +0100 [thread overview]
Message-ID: <8d90ab93-cc15-4e14-a972-ebdd2eb89f00@gmail.com> (raw)
In-Reply-To: <20231106151124.9175-2-hau@realtek.com>
On 06.11.2023 16:11, ChunHao Lin wrote:
> For devices that support DASH, even DASH is disabled, there may still
> exist a default firmware that will influence device behavior.
> So driver needs to handle DASH for devices that support DASH, no matter
> the DASH status is.
>
AFAICS there's no functional change in patch 1 (except the dash disabled
message). It just prepares patch 2. That's worth mentioning.
> Fixes: ee7a1beb9759 ("r8169:call "rtl8168_driver_start" "rtl8168_driver_stop" only when hardware dash function is enabled")
> Signed-off-by: ChunHao Lin <hau@realtek•com>
stable should be cc'ed
> ---
> drivers/net/ethernet/realtek/r8169_main.c | 37 +++++++++++++++++------
> 1 file changed, 27 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
> index 4b8251cdb436..8cbd7c96d9e1 100644
> --- a/drivers/net/ethernet/realtek/r8169_main.c
> +++ b/drivers/net/ethernet/realtek/r8169_main.c
> @@ -624,6 +624,7 @@ struct rtl8169_private {
>
> unsigned supports_gmii:1;
> unsigned aspm_manageable:1;
> + unsigned dash_enable:1;
better: dash_enabled
> dma_addr_t counters_phys_addr;
> struct rtl8169_counters *counters;
> struct rtl8169_tc_offsets tc_offset;
> @@ -1253,14 +1254,26 @@ static bool r8168ep_check_dash(struct rtl8169_private *tp)
> return r8168ep_ocp_read(tp, 0x128) & BIT(0);
> }
>
> -static enum rtl_dash_type rtl_check_dash(struct rtl8169_private *tp)
> +static bool rtl_check_dash(struct rtl8169_private *tp)
maybe better: rtl_dash_is_enabled()
> +{
> + switch (tp->dash_type) {
> + case RTL_DASH_DP:
> + return r8168dp_check_dash(tp);
> + case RTL_DASH_EP:
> + return r8168ep_check_dash(tp);
> + default:
> + return 0;
false instead of 0
> + }
> +}
> +
> +static enum rtl_dash_type rtl_check_dash_type(struct rtl8169_private *tp)
> {
maybe better: rtl_get_dash_type()
> switch (tp->mac_version) {
> case RTL_GIGA_MAC_VER_28:
> case RTL_GIGA_MAC_VER_31:
> - return r8168dp_check_dash(tp) ? RTL_DASH_DP : RTL_DASH_NONE;
> + return RTL_DASH_DP;
> case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:
> - return r8168ep_check_dash(tp) ? RTL_DASH_EP : RTL_DASH_NONE;
> + return RTL_DASH_EP;
> default:
> return RTL_DASH_NONE;
> }
> @@ -1453,7 +1466,7 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts)
>
> device_set_wakeup_enable(tp_to_dev(tp), wolopts);
>
> - if (tp->dash_type == RTL_DASH_NONE) {
> + if (!tp->dash_enable) {
> rtl_set_d3_pll_down(tp, !wolopts);
> tp->dev->wol_enabled = wolopts ? 1 : 0;
> }
> @@ -2512,7 +2525,7 @@ static void rtl_wol_enable_rx(struct rtl8169_private *tp)
>
> static void rtl_prepare_power_down(struct rtl8169_private *tp)
> {
> - if (tp->dash_type != RTL_DASH_NONE)
> + if (tp->dash_enable)
> return;
>
> if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||
> @@ -4867,7 +4880,7 @@ static int rtl8169_runtime_idle(struct device *device)
> {
> struct rtl8169_private *tp = dev_get_drvdata(device);
>
> - if (tp->dash_type != RTL_DASH_NONE)
> + if (tp->dash_enable)
> return -EBUSY;
>
> if (!netif_running(tp->dev) || !netif_carrier_ok(tp->dev))
> @@ -4894,7 +4907,7 @@ static void rtl_shutdown(struct pci_dev *pdev)
> rtl_rar_set(tp, tp->dev->perm_addr);
>
> if (system_state == SYSTEM_POWER_OFF &&
> - tp->dash_type == RTL_DASH_NONE) {
> + !tp->dash_enable) {
> pci_wake_from_d3(pdev, tp->saved_wolopts);
> pci_set_power_state(pdev, PCI_D3hot);
> }
> @@ -5252,7 +5265,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1);
> tp->aspm_manageable = !rc;
>
> - tp->dash_type = rtl_check_dash(tp);
> + tp->dash_type = rtl_check_dash_type(tp);
> + tp->dash_enable = rtl_check_dash(tp);
>
> tp->cp_cmd = RTL_R16(tp, CPlusCmd) & CPCMD_MASK;
>
> @@ -5323,7 +5337,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> /* configure chip for default features */
> rtl8169_set_features(dev, dev->features);
>
> - if (tp->dash_type == RTL_DASH_NONE) {
> + if (!tp->dash_enable) {
> rtl_set_d3_pll_down(tp, true);
> } else {
> rtl_set_d3_pll_down(tp, false);
> @@ -5363,7 +5377,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> "ok" : "ko");
>
> if (tp->dash_type != RTL_DASH_NONE) {
> - netdev_info(dev, "DASH enabled\n");
> + if (tp->dash_enable)
> + netdev_info(dev, "DASH enabled\n");
> + else
> + netdev_info(dev, "DASH disabled\n");
alternative:
netdev_info(dev, "DASH %s\n", tp->dash_enabled ? "enabled" : "disabled")
> rtl8168_driver_start(tp);
> }
>
next prev parent reply other threads:[~2023-11-07 7:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 15:11 [PATCH net 0/2] r8169: fix DASH deviceis network lost issue ChunHao Lin
2023-11-06 15:11 ` [PATCH net 1/2] r8169: add handling DASH when DASH is disabled ChunHao Lin
2023-11-07 7:12 ` Heiner Kallweit [this message]
2023-11-06 15:11 ` [PATCH net 2/2] r8169: fix network lost after resume on DASH systems ChunHao Lin
2023-11-07 7:15 ` Heiner Kallweit
2023-11-08 18:07 ` Hau
2023-11-07 7:14 ` [PATCH net 0/2] r8169: fix DASH deviceis network lost issue Heiner Kallweit
2023-11-07 17:53 ` Jakub Kicinski
2023-11-08 18:08 ` Hau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8d90ab93-cc15-4e14-a972-ebdd2eb89f00@gmail.com \
--to=hkallweit1@gmail$(echo .)com \
--cc=hau@realtek$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nic_swsd@realtek$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox