Merge branch 'net-atlantic-various-non-functional-changes' (b08866f4) · Commits · 戴 / test

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -124,21 +124,21 @@ static const char aq_macsec_stat_names[][ETH_GSTRING_LEN] = {
		"MACSec OutUnctrlHitDropRedir",
		};

		static const char *aq_macsec_txsc_stat_names[] = {
		static const char * const aq_macsec_txsc_stat_names[] = {
		"MACSecTXSC%d ProtectedPkts",
		"MACSecTXSC%d EncryptedPkts",
		"MACSecTXSC%d ProtectedOctets",
		"MACSecTXSC%d EncryptedOctets",
		};

		static const char *aq_macsec_txsa_stat_names[] = {
		static const char * const aq_macsec_txsa_stat_names[] = {
		"MACSecTXSC%dSA%d HitDropRedirect",
		"MACSecTXSC%dSA%d Protected2Pkts",
		"MACSecTXSC%dSA%d ProtectedPkts",
		"MACSecTXSC%dSA%d EncryptedPkts",
		};

		static const char *aq_macsec_rxsa_stat_names[] = {
		static const char * const aq_macsec_rxsa_stat_names[] = {
		"MACSecRXSC%dSA%d UntaggedHitPkts",
		"MACSecRXSC%dSA%d CtrlHitDrpRedir",
		"MACSecRXSC%dSA%d NotUsingSa",
		@@ -607,7 +607,9 @@ static int aq_ethtool_get_ts_info(struct net_device *ndev,
		BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) \|
		BIT(HWTSTAMP_FILTER_PTP_V2_EVENT);

		#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
		info->phc_index = ptp_clock_index(aq_ptp_get_ptp_clock(aq_nic->aq_ptp));
		#endif

		return 0;
		}
		@@ -716,13 +718,12 @@ static void aq_ethtool_get_pauseparam(struct net_device *ndev,
		struct ethtool_pauseparam *pause)
		{
		struct aq_nic_s *aq_nic = netdev_priv(ndev);
		u32 fc = aq_nic->aq_nic_cfg.fc.req;
		int fc = aq_nic->aq_nic_cfg.fc.req;

		pause->autoneg = 0;

		pause->rx_pause = !!(fc & AQ_NIC_FC_RX);
		pause->tx_pause = !!(fc & AQ_NIC_FC_TX);

		}

		static int aq_ethtool_set_pauseparam(struct net_device *ndev,

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

+16 −4

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_main.c: Main file for aQuantia Linux driver. */
		@@ -98,6 +99,7 @@ static int aq_ndev_start_xmit(struct sk_buff skb, struct net_device ndev)
		{
		struct aq_nic_s *aq_nic = netdev_priv(ndev);

		#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
		if (unlikely(aq_utils_obj_test(&aq_nic->flags, AQ_NIC_PTP_DPATH_UP))) {
		/* Hardware adds the Timestamp for PTPv2 802.AS1
		* and PTPv2 IPv4 UDP.
		@@ -114,6 +116,7 @@ static int aq_ndev_start_xmit(struct sk_buff skb, struct net_device ndev)
		unlikely(eth_hdr(skb)->h_proto == htons(ETH_P_1588)))
		return aq_ptp_xmit(aq_nic, skb);
		}
		#endif

		skb_tx_timestamp(skb);
		return aq_nic_xmit(aq_nic, skb);
		@@ -222,6 +225,7 @@ static void aq_ndev_set_multicast_settings(struct net_device *ndev)
		(void)aq_nic_set_multicast_list(aq_nic, ndev);
		}

		#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
		static int aq_ndev_config_hwtstamp(struct aq_nic_s *aq_nic,
		struct hwtstamp_config *config)
		{
		@@ -256,26 +260,31 @@ static int aq_ndev_config_hwtstamp(struct aq_nic_s *aq_nic,

		return aq_ptp_hwtstamp_config_set(aq_nic->aq_ptp, config);
		}
		#endif

		static int aq_ndev_hwtstamp_set(struct aq_nic_s aq_nic, struct ifreq ifr)
		{
		struct hwtstamp_config config;
		#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
		int ret_val;
		#endif

		if (!aq_nic->aq_ptp)
		return -EOPNOTSUPP;

		if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
		return -EFAULT;

		#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
		ret_val = aq_ndev_config_hwtstamp(aq_nic, &config);
		if (ret_val)
		return ret_val;
		#endif

		return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
		-EFAULT : 0;
		}

		#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
		static int aq_ndev_hwtstamp_get(struct aq_nic_s aq_nic, struct ifreq ifr)
		{
		struct hwtstamp_config config;
		@@ -287,6 +296,7 @@ static int aq_ndev_hwtstamp_get(struct aq_nic_s aq_nic, struct ifreq ifr)
		return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
		-EFAULT : 0;
		}
		#endif

		static int aq_ndev_ioctl(struct net_device netdev, struct ifreq ifr, int cmd)
		{
		@@ -296,8 +306,10 @@ static int aq_ndev_ioctl(struct net_device netdev, struct ifreq ifr, int cmd)
		case SIOCSHWTSTAMP:
		return aq_ndev_hwtstamp_set(aq_nic, ifr);

		#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
		case SIOCGHWTSTAMP:
		return aq_ndev_hwtstamp_get(aq_nic, ifr);
		#endif
		}

		return -EOPNOTSUPP;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1188,7 +1188,7 @@ int aq_nic_set_loopback(struct aq_nic_s *self)

		if (!self->aq_hw_ops->hw_set_loopback \|\|
		!self->aq_fw_ops->set_phyloopback)
		return -ENOTSUPP;
		return -EOPNOTSUPP;

		mutex_lock(&self->fwreq_mutex);
		self->aq_hw_ops->hw_set_loopback(self->aq_hw,

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

+5 −4

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.h: Declaration of common code for NIC. */

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

+5 −4

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_pci_func.c: Definition of PCI functions. */
		@@ -114,7 +115,7 @@ static int aq_pci_probe_get_hw_by_id(struct pci_dev *pdev,
		return 0;
		}

		int aq_pci_func_init(struct pci_dev *pdev)
		static int aq_pci_func_init(struct pci_dev *pdev)
		{
		int err;

Admin message