Commit 2c674bec authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-atlantic-driver-updates' 

Mark Starovoytov says:

====================
net: atlantic: driver updates

This patch series contains several minor cleanups for the previously
submitted series.

We also add Marvell copyrights on newly touched files.

v2:
 * accommodated review comments related to the last patch in series
   (MAC generation)

v1: https://patchwork.ozlabs.org/cover/1285011/


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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5eb2bcf2 b4de6c49

drivers/net/ethernet/aquantia/atlantic/aq_common.h

+6 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * aQuantia Corporation Network Driver

 * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved

/* Atlantic Network Driver

 *

 * Copyright (C) 2014-2019 aQuantia Corporation

 * Copyright (C) 2019-2020 Marvell International Ltd.

 */



/* File aq_common.h: Basic includes for all files in project. */
@@ -53,14 +54,14 @@ 
#define AQ_NIC_RATE_10G		BIT(0)

#define AQ_NIC_RATE_5G		BIT(1)

#define AQ_NIC_RATE_5GSR	BIT(2)

#define AQ_NIC_RATE_2GS		BIT(3)

#define AQ_NIC_RATE_2G5		BIT(3)

#define AQ_NIC_RATE_1G		BIT(4)

#define AQ_NIC_RATE_100M	BIT(5)

#define AQ_NIC_RATE_10M		BIT(6)



#define AQ_NIC_RATE_EEE_10G	BIT(7)

#define AQ_NIC_RATE_EEE_5G	BIT(8)

#define AQ_NIC_RATE_EEE_2GS	BIT(9)

#define AQ_NIC_RATE_EEE_2G5	BIT(9)

#define AQ_NIC_RATE_EEE_1G	BIT(10)

#define AQ_NIC_RATE_EEE_100M	BIT(11)

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static enum hw_atl_fw2x_rate eee_mask_to_ethtool_mask(u32 speed) 
	if (speed & AQ_NIC_RATE_EEE_10G)

		rate |= SUPPORTED_10000baseT_Full;



	if (speed & AQ_NIC_RATE_EEE_2GS)

	if (speed & AQ_NIC_RATE_EEE_2G5)

		rate |= SUPPORTED_2500baseX_Full;



	if (speed & AQ_NIC_RATE_EEE_1G)

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+21 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * aQuantia Corporation Network Driver

 * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved

/* Atlantic Network Driver

 *

 * Copyright (C) 2014-2019 aQuantia Corporation

 * Copyright (C) 2019-2020 Marvell International Ltd.

 */



/* File aq_nic.c: Definition of common code for NIC. */
@@ -271,6 +272,14 @@ exit: 
	return err;

}



static bool aq_nic_is_valid_ether_addr(const u8 *addr)

{

	/* Some engineering samples of Aquantia NICs are provisioned with a

	 * partially populated MAC, which is still invalid.

	 */

	return !(addr[0] == 0 && addr[1] == 0 && addr[2] == 0);

}



int aq_nic_ndev_register(struct aq_nic_s *self)

{

	int err = 0;
@@ -295,6 +304,12 @@ int aq_nic_ndev_register(struct aq_nic_s *self) 
	if (err)

		goto err_exit;



	if (!is_valid_ether_addr(self->ndev->dev_addr) ||

	    !aq_nic_is_valid_ether_addr(self->ndev->dev_addr)) {

		netdev_warn(self->ndev, "MAC is invalid, will use random.");

		eth_hw_addr_random(self->ndev);

	}



#if defined(AQ_CFG_MAC_ADDR_PERMANENT)

	{

		static u8 mac_addr_permanent[] = AQ_CFG_MAC_ADDR_PERMANENT;
@@ -894,7 +909,7 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self, 
		ethtool_link_ksettings_add_link_mode(cmd, supported,

						     5000baseT_Full);



	if (self->aq_nic_cfg.aq_hw_caps->link_speed_msk & AQ_NIC_RATE_2GS)

	if (self->aq_nic_cfg.aq_hw_caps->link_speed_msk & AQ_NIC_RATE_2G5)

		ethtool_link_ksettings_add_link_mode(cmd, supported,

						     2500baseT_Full);
@@ -937,7 +952,7 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self, 
		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     5000baseT_Full);



	if (self->aq_nic_cfg.link_speed_msk  & AQ_NIC_RATE_2GS)

	if (self->aq_nic_cfg.link_speed_msk  & AQ_NIC_RATE_2G5)

		ethtool_link_ksettings_add_link_mode(cmd, advertising,

						     2500baseT_Full);
@@ -996,7 +1011,7 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self, 
			break;



		case SPEED_2500:

			rate = AQ_NIC_RATE_2GS;

			rate = AQ_NIC_RATE_2G5;

			break;



		case SPEED_5000:

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c

+9 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * aQuantia Corporation Network Driver

 * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved

/* Atlantic Network Driver

 *

 * Copyright (C) 2014-2019 aQuantia Corporation

 * Copyright (C) 2019-2020 Marvell International Ltd.

 */



/* File hw_atl_a0.c: Definition of Atlantic hardware specific functions. */
@@ -47,7 +48,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc100 = { 
	DEFAULT_A0_BOARD_BASIC_CAPABILITIES,

	.media_type = AQ_HW_MEDIA_TYPE_FIBRE,

	.link_speed_msk = AQ_NIC_RATE_5G |

			  AQ_NIC_RATE_2GS |

			  AQ_NIC_RATE_2G5 |

			  AQ_NIC_RATE_1G |

			  AQ_NIC_RATE_100M,

};
@@ -57,7 +58,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc107 = { 
	.media_type = AQ_HW_MEDIA_TYPE_TP,

	.link_speed_msk = AQ_NIC_RATE_10G |

			  AQ_NIC_RATE_5G |

			  AQ_NIC_RATE_2GS |

			  AQ_NIC_RATE_2G5 |

			  AQ_NIC_RATE_1G |

			  AQ_NIC_RATE_100M,

};
@@ -66,7 +67,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc108 = { 
	DEFAULT_A0_BOARD_BASIC_CAPABILITIES,

	.media_type = AQ_HW_MEDIA_TYPE_TP,

	.link_speed_msk = AQ_NIC_RATE_5G |

			  AQ_NIC_RATE_2GS |

			  AQ_NIC_RATE_2G5 |

			  AQ_NIC_RATE_1G |

			  AQ_NIC_RATE_100M,

};
@@ -74,7 +75,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc108 = { 
const struct aq_hw_caps_s hw_atl_a0_caps_aqc109 = {

	DEFAULT_A0_BOARD_BASIC_CAPABILITIES,

	.media_type = AQ_HW_MEDIA_TYPE_TP,

	.link_speed_msk = AQ_NIC_RATE_2GS |

	.link_speed_msk = AQ_NIC_RATE_2G5 |

			  AQ_NIC_RATE_1G |

			  AQ_NIC_RATE_100M,

};
@@ -267,8 +268,7 @@ static int hw_atl_a0_hw_init_tx_path(struct aq_hw_s *self) 
	hw_atl_tdm_tx_desc_wr_wb_irq_en_set(self, 1U);



	/* misc */

	aq_hw_write_reg(self, 0x00007040U, ATL_HW_IS_CHIP_FEATURE(self, TPO2) ?

			0x00010000U : 0x00000000U);

	aq_hw_write_reg(self, 0x00007040U, 0x00000000U);

	hw_atl_tdm_tx_dca_en_set(self, 0U);

	hw_atl_tdm_tx_dca_mode_set(self, 0U);

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+10 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * aQuantia Corporation Network Driver

 * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved

/* Atlantic Network Driver

 *

 * Copyright (C) 2014-2019 aQuantia Corporation

 * Copyright (C) 2019-2020 Marvell International Ltd.

 */



/* File hw_atl_b0.c: Definition of Atlantic hardware specific functions. */
@@ -59,7 +60,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc100 = { 
	.media_type = AQ_HW_MEDIA_TYPE_FIBRE,

	.link_speed_msk = AQ_NIC_RATE_10G |

			  AQ_NIC_RATE_5G |

			  AQ_NIC_RATE_2GS |

			  AQ_NIC_RATE_2G5 |

			  AQ_NIC_RATE_1G |

			  AQ_NIC_RATE_100M,

};
@@ -69,7 +70,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc107 = { 
	.media_type = AQ_HW_MEDIA_TYPE_TP,

	.link_speed_msk = AQ_NIC_RATE_10G |

			  AQ_NIC_RATE_5G |

			  AQ_NIC_RATE_2GS |

			  AQ_NIC_RATE_2G5 |

			  AQ_NIC_RATE_1G |

			  AQ_NIC_RATE_100M,

};
@@ -78,7 +79,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = { 
	DEFAULT_B0_BOARD_BASIC_CAPABILITIES,

	.media_type = AQ_HW_MEDIA_TYPE_TP,

	.link_speed_msk = AQ_NIC_RATE_5G |

			  AQ_NIC_RATE_2GS |

			  AQ_NIC_RATE_2G5 |

			  AQ_NIC_RATE_1G |

			  AQ_NIC_RATE_100M,

};
@@ -86,7 +87,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = { 
const struct aq_hw_caps_s hw_atl_b0_caps_aqc109 = {

	DEFAULT_B0_BOARD_BASIC_CAPABILITIES,

	.media_type = AQ_HW_MEDIA_TYPE_TP,

	.link_speed_msk = AQ_NIC_RATE_2GS |

	.link_speed_msk = AQ_NIC_RATE_2G5 |

			  AQ_NIC_RATE_1G |

			  AQ_NIC_RATE_100M,

};
@@ -215,7 +216,7 @@ err_exit: 
	return err;

}



int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,

static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,

				struct aq_rss_parameters *rss_params)

{

	u32 num_rss_queues = max(1U, self->aq_nic_cfg->num_rss_queues);

CRA Git | Maintained and supported by SUSTech CRA and CCSE