Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35763bd6 authored by Mark Starovoytov's avatar Mark Starovoytov Committed by Gerrit - the friendly Code Review server
Browse files

atlantic forwarding driver v1.1.9 



  [ATLDRV-1529] - FWD: Segmentation fault occurs for user operations
  [ATLDRV-1552] - Fwd: build fails with old gcc
  [ATLDRV-1553] - Fwd: BUG message when LOCKDEP is enabled
  [ATLDRV-1505] - FWD: New dev ids
  [ATLDRV-1542] - FWD: build fails on 5.8-rcX

Change-Id: I1db48c9cbe2a133a10bee4d3a6736f898b72af5a
Signed-off-by: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: default avatarNikita Danilov <ndanilov@marvell.com>
Co-authored: Nikita Danilov <ndanilov@marvell.com>
Git-commit: 67474e4efc0d0a70286b4c3def3d39e16e344406
Git-repo: https://github.com/aquantia/linux-4.14-atlantic-forwarding


Signed-off-by: default avatarLakshit Tyagi <ltyagi@codeaurora.org>
parent 3a430fa5

drivers/net/ethernet/aquantia/atlantic-fwd/atl2_fw.c

+6 −2
Original line number Diff line number Diff line
@@ -498,9 +498,11 @@ static struct atl_link_type *atl2_fw_check_link(struct atl_hw *hw) 
{

	struct atl_link_type *link;

	struct atl_link_state *lstate = &hw->link_state;

	struct phy_health_monitor_s phy_health_monitor = {0};

	struct phy_health_monitor_s phy_health_monitor;

	int ret = 0;



	memset(&phy_health_monitor, 0, sizeof(phy_health_monitor));



	atl_lock_fw(hw);



	__atl2_fw_update_link_status(hw);
@@ -700,10 +702,12 @@ static int atl2_fw_enable_wol(struct atl_hw *hw, unsigned int wol_mode) 
static int atl2_fw_update_thermal(struct atl_hw *hw)

{

	bool enable = !!(hw->thermal.flags & atl_thermal_monitor);

	struct phy_health_monitor_s phy_health_monitor = {0};

	struct phy_health_monitor_s phy_health_monitor;

	struct thermal_shutdown_s thermal_shutdown;

	int ret = 0;



	memset(&phy_health_monitor, 0, sizeof(phy_health_monitor));



	atl_lock_fw(hw);



	atl2_shared_buffer_get(hw, thermal_shutdown, thermal_shutdown);

drivers/net/ethernet/aquantia/atlantic-fwd/atl_common.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/netdevice.h>

#include <linux/moduleparam.h>



#define ATL_VERSION "1.1.8"

#define ATL_VERSION "1.1.9"



struct atl_nic;

drivers/net/ethernet/aquantia/atlantic-fwd/atl_ethtool.c

+3 −1
Original line number Diff line number Diff line
@@ -111,9 +111,11 @@ struct atl_ethtool_compat { 
static int atl_ethtool_get_settings(struct net_device *ndev,

				 struct ethtool_cmd *cmd)

{

	struct atl_ethtool_compat cmd_compat = {0};

	struct atl_nic *nic = netdev_priv(ndev);

	struct atl_link_state *lstate = &nic->hw.link_state;

	struct atl_ethtool_compat cmd_compat;



	memset(&cmd_compat, 0, sizeof(cmd_compat));



	atl_ethtool_get_common(cmd, &cmd_compat, lstate, true);

	cmd->supported = cmd_compat.link_modes.supported;

drivers/net/ethernet/aquantia/atlantic-fwd/atl_fw.c

+0 −9
Original line number Diff line number Diff line
@@ -939,14 +939,6 @@ static void atl_fw3_set_ptp(struct atl_hw *hw, bool on) 
	atl_unlock_fw(hw);

}



static void atl_fw3_adjust_ptp(struct atl_hw *hw, uint64_t adj)

{

	atl_lock_fw(hw);

	atl_write(hw, ATL_RX_SPARE_CTRL0, lower_32_bits(adj));

	atl_write(hw, ATL_RX_SPARE_CTRL1, upper_32_bits(adj));

	atl_unlock_fw(hw);

}



static struct atl_fw_ops atl_fw_ops[2] = {

	[0] = {

		.__wait_fw_init = __atl_fw1_wait_fw_init,
@@ -988,7 +980,6 @@ static struct atl_fw_ops atl_fw_ops[2] = { 
		.update_thermal = atl_fw2_update_thermal,

		.send_ptp_req = atl_fw2_send_ptp_request,

		.set_ptp = atl_fw3_set_ptp,

		.adjust_ptp = atl_fw3_adjust_ptp,

		.deinit = atl_fw1_unsupported,

	},

};

drivers/net/ethernet/aquantia/atlantic-fwd/atl_fw.h

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ struct atl_fw_ops { 
	int (*update_thermal)(struct atl_hw *hw);

	int (*send_ptp_req)(struct atl_hw *hw, struct ptp_msg_fw_request *msg);

	void (*set_ptp)(struct atl_hw *hw, bool on);

	void (*adjust_ptp)(struct atl_hw *hw, uint64_t adj);

	int (*deinit)(struct atl_hw *hw);

};