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

Commit 3e5d0bf9 authored by Dmitry Bogdanov's avatar Dmitry Bogdanov Committed by Gerrit - the friendly Code Review server
Browse files

atlantic forwarding driver v1.1.5 

  [ATLDRV-1382] - Failed install Driver 1.1.4 on Antigua
  [ATLDRV-1384] - WOL does not work on Antigua

Change-Id: I09323211112ffe1c8deacfbfef2badaaa5688357
Signed-off: Dmitry Bogdanov <dbogdanov@marvell.com>
Git-commit: 274a6d9d013241c4a8d7cc89c270e0458735362d
Git-repo: https://github.com/aquantia/linux-4.14-atlantic-forwarding


Signed-off-by: default avatarJinesh K. Jayakumar <jineshk@codeaurora.org>
parent 37e7a537

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

+8 −4
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static int atl2_fw_set_phy_loopback(struct atl_nic *nic, u32 mode) 
	switch (mode) {

	case ATL_PF_LPB_INT_PHY:

		if (!device_link_caps.internal_loopback) {

			ret = -ENOTSUPP;

			ret = -EOPNOTSUPP;

			goto unlock;

		}
@@ -622,7 +622,7 @@ static int atl2_fw_set_phy_loopback(struct atl_nic *nic, u32 mode) 
		break;

	case ATL_PF_LPB_EXT_PHY:

		if (!device_link_caps.external_loopback) {

			ret = -ENOTSUPP;

			ret = -EOPNOTSUPP;

			goto unlock;

		}

		link_options.external_loopback = on;
@@ -640,6 +640,7 @@ static int atl2_fw_set_phy_loopback(struct atl_nic *nic, u32 mode) 


static int atl2_fw_enable_wol(struct atl_hw *hw, unsigned int wol_mode)

{

	struct link_control_s link_control;

	struct wake_on_lan_s wake_on_lan;

	struct mac_address_s mac_address;

	int ret = 0;
@@ -666,7 +667,10 @@ static int atl2_fw_enable_wol(struct atl_hw *hw, unsigned int wol_mode) 


	atl2_shared_buffer_write(hw, mac_address, mac_address);

	atl2_shared_buffer_write(hw, sleep_proxy, wake_on_lan);

	atl2_mif_host_finished_write_set(hw, 1);

	atl2_shared_buffer_get(hw, link_control, link_control);

	link_control.mode = ATL2_HOST_MODE_SLEEP_PROXY;

	atl2_shared_buffer_write(hw, link_control, link_control);



	ret = atl2_shared_buffer_finish_ack(hw);



	atl_unlock_fw(hw);
@@ -719,7 +723,7 @@ static int atl2_fw_set_pad_stripping(struct atl_hw *hw, bool on) 


static int atl2_fw_unsupported(struct atl_hw *hw)

{

	return -ENOTSUPP;

	return -EOPNOTSUPP;

}



int atl2_get_fw_version(struct atl_hw *hw, u32 *fw_version)

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

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

#include <linux/moduleparam.h>



#define ATL_VERSION "1.1.4"

#define ATL_VERSION "1.1.5"



struct atl_nic;

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

+2 −2
Original line number Diff line number Diff line
@@ -677,12 +677,12 @@ static int atl_suspend_common(struct device *dev, unsigned int wol_mode) 
	atl_clear_rdm_cache(nic);

	atl_clear_tdm_cache(nic);



	hw->mcp.ops->deinit(hw);



	if (wol_mode) {

		ret = hw->mcp.ops->enable_wol(hw, wol_mode);

		if (ret)

			atl_dev_err("Enable WoL failed: %d\n", -ret);

	} else {

		hw->mcp.ops->deinit(hw);

	}



	clear_bit(ATL_ST_ENABLED, &hw->state);

drivers/net/ethernet/aquantia/atlantic-fwd/release_notes.txt

+5 −0
Original line number Diff line number Diff line 
Version 1.1.5

=============

[ATLDRV-1382] - Failed install Driver 1.1.4 on Antigua

[ATLDRV-1384] - WOL does not work on Antigua



Version 1.1.4

==============

[ATLDRV-1371] - Add supported eee with 2.5G and 5G