Commit fb8d1d7e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-aquantia-PTP-support-for-AQC-devices' 



Igor Russkikh says:

====================
net: aquantia: PTP support for AQC devices

This patchset introduces PTP feature support in Aquantia AQC atlantic driver.

This implementation is a joined effort of aquantia developers:
Egor is the main designer and driver/firmware architect on PTP,
Sergey and Dmitry are included as co-developers.
Dmitry also helped me in the overall patchset preparations.

Feature was verified on AQC hardware with testptp tool, linuxptp,
gptp and with Motu hardware unit.

version3 updates:
- Review comments applied: error handling, various fixes

version2 updates:
- Fixing issues from Andrew's review: replacing self with
  ptp var name, making ptp_clk_offset a field in the ptp instance.
  devm_kzalloc advice is actually non applicable, because ptp object gets
  created/destroyed on each network device close/open and it should not be
  linked with dev lifecycle.
- Rearranging commit authorship, adding Egor as a ptp module main maintainer
- Fixing kbuild 32bit division issues
====================

Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 337d866a 4ef511bc

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,13 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
F:	drivers/net/ethernet/aquantia/atlantic/

F:	Documentation/networking/device_drivers/aquantia/atlantic.txt













AQUANTIA ETHERNET DRIVER PTP SUBSYSTEM













M:	Egor Pomozov <epomozov@marvell.com>













L:	netdev@vger.kernel.org













S:	Supported













W:	http://www.aquantia.com













F:	drivers/net/ethernet/aquantia/atlantic/aq_ptp*



























ARC FRAMEBUFFER DRIVER















M:	Jaya Kumar <jayalk@intworks.biz>















S:	Maintained

































drivers/net/ethernet/aquantia/atlantic/Makefile



+2
−0






























Original line number
Diff line number
Diff line








@@ -24,6 +24,8 @@ atlantic-objs := aq_main.o \













	aq_ethtool.o \















	aq_drvinfo.o \















	aq_filters.o \













	aq_ptp.o \













	aq_phy.o \















	hw_atl/hw_atl_a0.o \















	hw_atl/hw_atl_b0.o \















	hw_atl/hw_atl_utils.o \

































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



+2
−2






























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













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















 */































/* File aq_cfg.h: Definition of configuration parameters and constants. */









@@ -27,7 +27,7 @@





























#define AQ_CFG_INTERRUPT_MODERATION_USEC_MAX (0x1FF * 2)





























#define AQ_CFG_IRQ_MASK                      0x1FFU













#define AQ_CFG_IRQ_MASK                      0x3FFU































#define AQ_CFG_VECS_MAX   8U















#define AQ_CFG_TCS_MAX    8U

































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



+34
−1






























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













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















 */































/* File aq_ethtool.c: Definition of ethertool related functions. */









@@ -9,8 +9,11 @@













#include "aq_ethtool.h"















#include "aq_nic.h"















#include "aq_vec.h"













#include "aq_ptp.h"















#include "aq_filters.h"





























#include <linux/ptp_clock_kernel.h>





























static void aq_ethtool_get_regs(struct net_device *ndev,















				struct ethtool_regs *regs, void *p)















{










@@ -377,6 +380,35 @@ static int aq_ethtool_set_wol(struct net_device *ndev,













	return err;















}





























static int aq_ethtool_get_ts_info(struct net_device *ndev,













				  struct ethtool_ts_info *info)













{













	struct aq_nic_s *aq_nic = netdev_priv(ndev);



























	ethtool_op_get_ts_info(ndev, info);



























	if (!aq_nic->aq_ptp)













		return 0;



























	info->so_timestamping |=













		SOF_TIMESTAMPING_TX_HARDWARE |













		SOF_TIMESTAMPING_RX_HARDWARE |













		SOF_TIMESTAMPING_RAW_HARDWARE;



























	info->tx_types = BIT(HWTSTAMP_TX_OFF) |













			 BIT(HWTSTAMP_TX_ON);



























	info->rx_filters = BIT(HWTSTAMP_FILTER_NONE);



























	info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |













			    BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |













			    BIT(HWTSTAMP_FILTER_PTP_V2_EVENT);



























	info->phc_index = ptp_clock_index(aq_ptp_get_ptp_clock(aq_nic->aq_ptp));



























	return 0;













}





























static enum hw_atl_fw2x_rate eee_mask_to_ethtool_mask(u32 speed)















{















	u32 rate = 0;










@@ -604,4 +636,5 @@ const struct ethtool_ops aq_ethtool_ops = {













	.set_link_ksettings  = aq_ethtool_set_link_ksettings,















	.get_coalesce	     = aq_ethtool_get_coalesce,















	.set_coalesce	     = aq_ethtool_set_coalesce,













	.get_ts_info         = aq_ethtool_get_ts_info,















};
























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



+11
−6






























Original line number
Diff line number
Diff line















// SPDX-License-Identifier: GPL-2.0-only













/* Copyright (C) 2014-2017 aQuantia Corporation. */













/* Copyright (C) 2014-2019 aQuantia Corporation. */































/* File aq_filters.c: RX filters related functions. */


























@@ -89,12 +89,14 @@ static int aq_check_approve_fl3l4(struct aq_nic_s *aq_nic,













				  struct aq_hw_rx_fltrs_s *rx_fltrs,















				  struct ethtool_rx_flow_spec *fsp)















{













	u32 last_location = AQ_RX_LAST_LOC_FL3L4 -













			    aq_nic->aq_hw_rx_fltrs.fl3l4.reserved_count;





























	if (fsp->location < AQ_RX_FIRST_LOC_FL3L4 ||













	    fsp->location > AQ_RX_LAST_LOC_FL3L4) {













	    fsp->location > last_location) {















		netdev_err(aq_nic->ndev,















			   "ethtool: location must be in range [%d, %d]",













			   AQ_RX_FIRST_LOC_FL3L4,













			   AQ_RX_LAST_LOC_FL3L4);













			   AQ_RX_FIRST_LOC_FL3L4, last_location);















		return -EINVAL;















	}















	if (rx_fltrs->fl3l4.is_ipv6 && rx_fltrs->fl3l4.active_ipv4) {










@@ -124,12 +126,15 @@ aq_check_approve_fl2(struct aq_nic_s *aq_nic,













		     struct aq_hw_rx_fltrs_s *rx_fltrs,















		     struct ethtool_rx_flow_spec *fsp)















{













	u32 last_location = AQ_RX_LAST_LOC_FETHERT -













			    aq_nic->aq_hw_rx_fltrs.fet_reserved_count;





























	if (fsp->location < AQ_RX_FIRST_LOC_FETHERT ||













	    fsp->location > AQ_RX_LAST_LOC_FETHERT) {













	    fsp->location > last_location) {















		netdev_err(aq_nic->ndev,















			   "ethtool: location must be in range [%d, %d]",















			   AQ_RX_FIRST_LOC_FETHERT,













			   AQ_RX_LAST_LOC_FETHERT);













			   last_location);















		return -EINVAL;















	}

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE