]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: atlantic: add set_power to fw_ops for atl2 to fix wol
authorEric Work <work.eric@gmail.com>
Sun, 29 Jun 2025 05:15:28 +0000 (22:15 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:25:57 +0000 (16:25 +0200)
[ Upstream commit fad9cf216597a71936ac87143d1618fbbcf97cbe ]

Aquantia AQC113(C) using ATL2FW doesn't properly prepare the NIC for
enabling wake-on-lan. The FW operation `set_power` was only implemented
for `hw_atl` and not `hw_atl2`. Implement the `set_power` functionality
for `hw_atl2`.

Tested with both AQC113 and AQC113C devices. Confirmed you can shutdown
the system and wake from S5 using magic packets. NIC was previously
powered off when entering S5. If the NIC was configured for WOL by the
Windows driver, loading the atlantic driver would disable WOL.

Partially cherry-picks changes from commit,
https://github.com/Aquantia/AQtion/commit/37bd5cc

Attributing original authors from Marvell for the referenced commit.

Closes: https://github.com/Aquantia/AQtion/issues/70
Co-developed-by: Igor Russkikh <irusskikh@marvell.com>
Co-developed-by: Mark Starovoitov <mstarovoitov@marvell.com>
Co-developed-by: Dmitry Bogdanov <dbogdanov@marvell.com>
Co-developed-by: Pavel Belous <pbelous@marvell.com>
Co-developed-by: Nikita Danilov <ndanilov@marvell.com>
Signed-off-by: Eric Work <work.eric@gmail.com>
Reviewed-by: Igor Russkikh <irusskikh@marvell.com>
Link: https://patch.msgid.link/20250629051535.5172-1-work.eric@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/aquantia/atlantic/aq_hw.h
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c

index dbd28466013580aca8cab6b99bbc168dd9c40e99..7f616abd3db2c4a382edae9b5c423501848e53e1 100644 (file)
@@ -113,6 +113,8 @@ struct aq_stats_s {
 #define AQ_HW_POWER_STATE_D0   0U
 #define AQ_HW_POWER_STATE_D3   3U
 
+#define        AQ_FW_WAKE_ON_LINK_RTPM BIT(10)
+
 #define AQ_HW_FLAG_STARTED     0x00000004U
 #define AQ_HW_FLAG_STOPPING    0x00000008U
 #define AQ_HW_FLAG_RESETTING   0x00000010U
index 58d426dda3edbf13b4e852b3fab14e720d55d3b2..1c5c27a9f30d343bed0d6c9a59e47e8255b99675 100644 (file)
@@ -462,6 +462,44 @@ static int aq_a2_fw_get_mac_temp(struct aq_hw_s *self, int *temp)
        return aq_a2_fw_get_phy_temp(self, temp);
 }
 
+static int aq_a2_fw_set_wol_params(struct aq_hw_s *self, const u8 *mac, u32 wol)
+{
+       struct mac_address_aligned_s mac_address;
+       struct link_control_s link_control;
+       struct wake_on_lan_s wake_on_lan;
+
+       memcpy(mac_address.aligned.mac_address, mac, ETH_ALEN);
+       hw_atl2_shared_buffer_write(self, mac_address, mac_address);
+
+       memset(&wake_on_lan, 0, sizeof(wake_on_lan));
+
+       if (wol & WAKE_MAGIC)
+               wake_on_lan.wake_on_magic_packet = 1U;
+
+       if (wol & (WAKE_PHY | AQ_FW_WAKE_ON_LINK_RTPM))
+               wake_on_lan.wake_on_link_up = 1U;
+
+       hw_atl2_shared_buffer_write(self, sleep_proxy, wake_on_lan);
+
+       hw_atl2_shared_buffer_get(self, link_control, link_control);
+       link_control.mode = AQ_HOST_MODE_SLEEP_PROXY;
+       hw_atl2_shared_buffer_write(self, link_control, link_control);
+
+       return hw_atl2_shared_buffer_finish_ack(self);
+}
+
+static int aq_a2_fw_set_power(struct aq_hw_s *self, unsigned int power_state,
+                             const u8 *mac)
+{
+       u32 wol = self->aq_nic_cfg->wol;
+       int err = 0;
+
+       if (wol)
+               err = aq_a2_fw_set_wol_params(self, mac, wol);
+
+       return err;
+}
+
 static int aq_a2_fw_set_eee_rate(struct aq_hw_s *self, u32 speed)
 {
        struct link_options_s link_options;
@@ -605,6 +643,7 @@ const struct aq_fw_ops aq_a2_fw_ops = {
        .set_state          = aq_a2_fw_set_state,
        .update_link_status = aq_a2_fw_update_link_status,
        .update_stats       = aq_a2_fw_update_stats,
+       .set_power          = aq_a2_fw_set_power,
        .get_mac_temp       = aq_a2_fw_get_mac_temp,
        .get_phy_temp       = aq_a2_fw_get_phy_temp,
        .set_eee_rate       = aq_a2_fw_set_eee_rate,