Commit 29ce8f97 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



include/linux/netdevice.h
net/socket.c

  d0efb162 ("net: don't unconditionally copy_from_user a struct ifreq for socket ioctls")

  876f0bf9 ("net: socket: simplify dev_ifconf handling")
  29c49648 ("net: socket: rework compat_ifreq_ioctl()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c3496da5 57f780f1

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

+3 −0
Original line number Diff line number Diff line
@@ -411,6 +411,9 @@ static int atl_resume_common(struct device *dev, bool deep) 
	pci_restore_state(pdev);



	if (deep) {

		/* Reinitialize Nic/Vecs objects */

		aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);



		ret = aq_nic_init(nic);

		if (ret)

			goto err_exit;

drivers/net/ethernet/intel/ice/ice_main.c

+9 −4
Original line number Diff line number Diff line
@@ -5122,6 +5122,7 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi) 
	struct ice_hw *hw = &pf->hw;

	struct sockaddr *addr = pi;

	enum ice_status status;

	u8 old_mac[ETH_ALEN];

	u8 flags = 0;

	int err = 0;

	u8 *mac;
@@ -5144,8 +5145,13 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi) 
	}



	netif_addr_lock_bh(netdev);

	ether_addr_copy(old_mac, netdev->dev_addr);

	/* change the netdev's MAC address */

	memcpy(netdev->dev_addr, mac, netdev->addr_len);

	netif_addr_unlock_bh(netdev);



	/* Clean up old MAC filter. Not an error if old filter doesn't exist */

	status = ice_fltr_remove_mac(vsi, netdev->dev_addr, ICE_FWD_TO_VSI);

	status = ice_fltr_remove_mac(vsi, old_mac, ICE_FWD_TO_VSI);

	if (status && status != ICE_ERR_DOES_NOT_EXIST) {

		err = -EADDRNOTAVAIL;

		goto err_update_filters;
@@ -5168,13 +5174,12 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi) 
	if (err) {

		netdev_err(netdev, "can't set MAC %pM. filter update failed\n",

			   mac);

		netif_addr_lock_bh(netdev);

		ether_addr_copy(netdev->dev_addr, old_mac);

		netif_addr_unlock_bh(netdev);

		return err;

	}



	/* change the netdev's MAC address */

	memcpy(netdev->dev_addr, mac, netdev->addr_len);

	netif_addr_unlock_bh(netdev);

	netdev_dbg(vsi->netdev, "updated MAC address to %pM\n",

		   netdev->dev_addr);

drivers/net/ethernet/intel/ice/ice_ptp.c

+54 −12
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static void ice_set_tx_tstamp(struct ice_pf *pf, bool on) 
		return;



	/* Set the timestamp enable flag for all the Tx rings */

	ice_for_each_rxq(vsi, i) {

	ice_for_each_txq(vsi, i) {

		if (!vsi->tx_rings[i])

			continue;

		vsi->tx_rings[i]->ptp_tx = on;
@@ -688,6 +688,41 @@ static int ice_ptp_cfg_clkout(struct ice_pf *pf, unsigned int chan, 
	return -EFAULT;

}



/**

 * ice_ptp_disable_all_clkout - Disable all currently configured outputs

 * @pf: pointer to the PF structure

 *

 * Disable all currently configured clock outputs. This is necessary before

 * certain changes to the PTP hardware clock. Use ice_ptp_enable_all_clkout to

 * re-enable the clocks again.

 */

static void ice_ptp_disable_all_clkout(struct ice_pf *pf)

{

	uint i;



	for (i = 0; i < pf->ptp.info.n_per_out; i++)

		if (pf->ptp.perout_channels[i].ena)

			ice_ptp_cfg_clkout(pf, i, NULL, false);

}



/**

 * ice_ptp_enable_all_clkout - Enable all configured periodic clock outputs

 * @pf: pointer to the PF structure

 *

 * Enable all currently configured clock outputs. Use this after

 * ice_ptp_disable_all_clkout to reconfigure the output signals according to

 * their configuration.

 */

static void ice_ptp_enable_all_clkout(struct ice_pf *pf)

{

	uint i;



	for (i = 0; i < pf->ptp.info.n_per_out; i++)

		if (pf->ptp.perout_channels[i].ena)

			ice_ptp_cfg_clkout(pf, i, &pf->ptp.perout_channels[i],

					   false);

}



/**

 * ice_ptp_gpio_enable_e810 - Enable/disable ancillary features of PHC

 * @info: the driver's PTP info structure
@@ -783,12 +818,17 @@ ice_ptp_settime64(struct ptp_clock_info *info, const struct timespec64 *ts) 
		goto exit;

	}



	/* Disable periodic outputs */

	ice_ptp_disable_all_clkout(pf);



	err = ice_ptp_write_init(pf, &ts64);

	ice_ptp_unlock(hw);



	if (!err)

		ice_ptp_update_cached_phctime(pf);



	/* Reenable periodic outputs */

	ice_ptp_enable_all_clkout(pf);

exit:

	if (err) {

		dev_err(ice_pf_to_dev(pf), "PTP failed to set time %d\n", err);
@@ -842,8 +882,14 @@ static int ice_ptp_adjtime(struct ptp_clock_info *info, s64 delta) 
		return -EBUSY;

	}



	/* Disable periodic outputs */

	ice_ptp_disable_all_clkout(pf);



	err = ice_ptp_write_adj(pf, delta);



	/* Reenable periodic outputs */

	ice_ptp_enable_all_clkout(pf);



	ice_ptp_unlock(hw);



	if (err) {
@@ -1064,17 +1110,6 @@ static long ice_ptp_create_clock(struct ice_pf *pf) 
	info = &pf->ptp.info;

	dev = ice_pf_to_dev(pf);



	/* Allocate memory for kernel pins interface */

	if (info->n_pins) {

		info->pin_config = devm_kcalloc(dev, info->n_pins,

						sizeof(*info->pin_config),

						GFP_KERNEL);

		if (!info->pin_config) {

			info->n_pins = 0;

			return -ENOMEM;

		}

	}



	/* Attempt to register the clock before enabling the hardware. */

	clock = ptp_clock_register(info, dev);

	if (IS_ERR(clock))
@@ -1278,6 +1313,8 @@ ice_ptp_flush_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx) 
{

	u8 idx;



	spin_lock(&tx->lock);



	for (idx = 0; idx < tx->len; idx++) {

		u8 phy_idx = idx + tx->quad_offset;
@@ -1290,6 +1327,8 @@ ice_ptp_flush_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx) 
			tx->tstamps[idx].skb = NULL;

		}

	}



	spin_unlock(&tx->lock);

}



/**
@@ -1550,6 +1589,9 @@ void ice_ptp_release(struct ice_pf *pf) 
	if (!pf->ptp.clock)

		return;



	/* Disable periodic outputs */

	ice_ptp_disable_all_clkout(pf);



	ice_clear_ptp_clock_index(pf);

	ptp_clock_unregister(pf->ptp.clock);

	pf->ptp.clock = NULL;

drivers/net/ethernet/mellanox/mlx5/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ int mlx5_register_device(struct mlx5_core_dev *dev) 
void mlx5_unregister_device(struct mlx5_core_dev *dev)

{

	mutex_lock(&mlx5_intf_mutex);

	dev->priv.flags |= MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV;

	dev->priv.flags = MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV;

	mlx5_rescan_drivers_locked(dev);

	mutex_unlock(&mlx5_intf_mutex);

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, 
	mlx5e_rep_queue_neigh_stats_work(priv);



	list_for_each_entry(flow, flow_list, tmp_list) {

		if (!mlx5e_is_offloaded_flow(flow))

		if (!mlx5e_is_offloaded_flow(flow) || !flow_flag_test(flow, SLOW))

			continue;

		attr = flow->attr;

		esw_attr = attr->esw_attr;
@@ -188,7 +188,7 @@ void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv, 
	int err;



	list_for_each_entry(flow, flow_list, tmp_list) {

		if (!mlx5e_is_offloaded_flow(flow))

		if (!mlx5e_is_offloaded_flow(flow) || flow_flag_test(flow, SLOW))

			continue;

		attr = flow->attr;

		esw_attr = attr->esw_attr;