tgupdate: merge t/upstream base into t/upstream

drivers/net/bareudp.c

@@ -609,7 +609,8 @@ static struct bareudp_dev *bareudp_find_dev(struct bareudp_net *bn,
 }
 
 static int bareudp_configure(struct net *net, struct net_device *dev,
- struct bareudp_conf *conf)
+ struct bareudp_conf *conf,
+ struct netlink_ext_ack *extack)
 {
  struct bareudp_net *bn = net_generic(net, bareudp_net_id);
  struct bareudp_dev *t, *bareudp = netdev_priv(dev);
@@ -618,13 +619,17 @@ static int bareudp_configure(struct net *net, struct net_device *dev,
  bareudp->net = net;
  bareudp->dev = dev;
  t = bareudp_find_dev(bn, conf);
- if (t)
+ if (t) {
+ NL_SET_ERR_MSG(extack, "Another bareudp device using the same port already exists");
  return -EBUSY;
+ }
 
  if (conf->multi_proto_mode &&
  (conf->ethertype != htons(ETH_P_MPLS_UC) &&
- conf->ethertype != htons(ETH_P_IP)))
+ conf->ethertype != htons(ETH_P_IP))) {
+ NL_SET_ERR_MSG(extack, "Cannot set multiproto mode for this ethertype (only IPv4 and unicast MPLS are supported)");
  return -EINVAL;
+ }
 
  bareudp->port = conf->port;
  bareudp->ethertype = conf->ethertype;
@@ -671,7 +676,7 @@ static int bareudp_newlink(struct net *net, struct net_device *dev,
  if (err)
  return err;
 
- err = bareudp_configure(net, dev, &conf);
+ err = bareudp_configure(net, dev, &conf, extack);
  if (err)
  return err;
 

drivers/net/bonding/bond_main.c

@@ -4094,6 +4094,7 @@ static int bond_eth_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cm
  struct mii_ioctl_data *mii = NULL;
  const struct net_device_ops *ops;
  struct net_device *real_dev;
+ struct hwtstamp_config cfg;
  struct ifreq ifrr;
  int res = 0;
 
@@ -4124,21 +4125,29 @@ static int bond_eth_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cm
  break;
  case SIOCSHWTSTAMP:
  case SIOCGHWTSTAMP:
- rcu_read_lock();
- real_dev = bond_option_active_slave_get_rcu(bond);
- rcu_read_unlock();
- if (real_dev) {
- strscpy_pad(ifrr.ifr_name, real_dev->name, IFNAMSIZ);
- ifrr.ifr_ifru = ifr->ifr_ifru;
+ if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))
+ return -EFAULT;
+
+ if (cfg.flags & HWTSTAMP_FLAG_BONDED_PHC_INDEX) {
+ rcu_read_lock();
+ real_dev = bond_option_active_slave_get_rcu(bond);
+ rcu_read_unlock();
+ if (real_dev) {
+ strscpy_pad(ifrr.ifr_name, real_dev->name, IFNAMSIZ);
+ ifrr.ifr_ifru = ifr->ifr_ifru;
+
+ ops = real_dev->netdev_ops;
+ if (netif_device_present(real_dev) && ops->ndo_eth_ioctl) {
+ res = ops->ndo_eth_ioctl(real_dev, &ifrr, cmd);
 
- ops = real_dev->netdev_ops;
- if (netif_device_present(real_dev) && ops->ndo_eth_ioctl)
- res = ops->ndo_eth_ioctl(real_dev, &ifrr, cmd);
+ if (!res)
+ ifr->ifr_ifru = ifrr.ifr_ifru;
 
- if (!res)
- ifr->ifr_ifru = ifrr.ifr_ifru;
+ return res;
+ }
+ }
  }
- break;
+ fallthrough;
  default:
  res = -EOPNOTSUPP;
  }

drivers/net/dsa/hirschmann/hellcreek.c

@@ -711,8 +711,9 @@ static int __hellcreek_fdb_add(struct hellcreek *hellcreek,
  u16 meta = 0;
 
  dev_dbg(hellcreek->dev, "Add static FDB entry: MAC=%pM, MASK=0x%02x, "
- "OBT=%d, REPRIO_EN=%d, PRIO=%d\n", entry->mac, entry->portmask,
- entry->is_obt, entry->reprio_en, entry->reprio_tc);
+ "OBT=%d, PASS_BLOCKED=%d, REPRIO_EN=%d, PRIO=%d\n", entry->mac,
+ entry->portmask, entry->is_obt, entry->pass_blocked,
+ entry->reprio_en, entry->reprio_tc);
 
  /* Add mac address */
  hellcreek_write(hellcreek, entry->mac[1] | (entry->mac[0] << 8), HR_FDBWDH);
@@ -723,6 +724,8 @@ static int __hellcreek_fdb_add(struct hellcreek *hellcreek,
  meta |= entry->portmask << HR_FDBWRM0_PORTMASK_SHIFT;
  if (entry->is_obt)
  meta |= HR_FDBWRM0_OBT;
+ if (entry->pass_blocked)
+ meta |= HR_FDBWRM0_PASS_BLOCKED;
  if (entry->reprio_en) {
  meta |= HR_FDBWRM0_REPRIO_EN;
  meta |= entry->reprio_tc << HR_FDBWRM0_REPRIO_TC_SHIFT;
@@ -1050,7 +1053,7 @@ static void hellcreek_setup_tc_identity_mapping(struct hellcreek *hellcreek)
 
 static int hellcreek_setup_fdb(struct hellcreek *hellcreek)
 {
- static struct hellcreek_fdb_entry ptp = {
+ static struct hellcreek_fdb_entry l2_ptp = {
  /* MAC: 01-1B-19-00-00-00 */
  .mac = { 0x01, 0x1b, 0x19, 0x00, 0x00, 0x00 },
  .portmask = 0x03, /* Management ports */
@@ -1061,24 +1064,94 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek)
  .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */
  .reprio_en = 1,
  };
- static struct hellcreek_fdb_entry p2p = {
+ static struct hellcreek_fdb_entry udp4_ptp = {
+ /* MAC: 01-00-5E-00-01-81 */
+ .mac = { 0x01, 0x00, 0x5e, 0x00, 0x01, 0x81 },
+ .portmask = 0x03, /* Management ports */
+ .age = 0,
+ .is_obt = 0,
+ .pass_blocked = 0,
+ .is_static = 1,
+ .reprio_tc = 6,
+ .reprio_en = 1,
+ };
+ static struct hellcreek_fdb_entry udp6_ptp = {
+ /* MAC: 33-33-00-00-01-81 */
+ .mac = { 0x33, 0x33, 0x00, 0x00, 0x01, 0x81 },
+ .portmask = 0x03, /* Management ports */
+ .age = 0,
+ .is_obt = 0,
+ .pass_blocked = 0,
+ .is_static = 1,
+ .reprio_tc = 6,
+ .reprio_en = 1,
+ };
+ static struct hellcreek_fdb_entry l2_p2p = {
  /* MAC: 01-80-C2-00-00-0E */
  .mac = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e },
  .portmask = 0x03, /* Management ports */
  .age = 0,
  .is_obt = 0,
- .pass_blocked = 0,
+ .pass_blocked = 1,
  .is_static = 1,
  .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */
  .reprio_en = 1,
  };
+ static struct hellcreek_fdb_entry udp4_p2p = {
+ /* MAC: 01-00-5E-00-00-6B */
+ .mac = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x6b },
+ .portmask = 0x03, /* Management ports */
+ .age = 0,
+ .is_obt = 0,
+ .pass_blocked = 1,
+ .is_static = 1,
+ .reprio_tc = 6,
+ .reprio_en = 1,
+ };
+ static struct hellcreek_fdb_entry udp6_p2p = {
+ /* MAC: 33-33-00-00-00-6B */
+ .mac = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x6b },
+ .portmask = 0x03, /* Management ports */
+ .age = 0,
+ .is_obt = 0,
+ .pass_blocked = 1,
+ .is_static = 1,
+ .reprio_tc = 6,
+ .reprio_en = 1,
+ };
+ static struct hellcreek_fdb_entry stp = {
+ /* MAC: 01-80-C2-00-00-00 */
+ .mac = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 },
+ .portmask = 0x03, /* Management ports */
+ .age = 0,
+ .is_obt = 0,
+ .pass_blocked = 1,
+ .is_static = 1,
+ .reprio_tc = 6,
+ .reprio_en = 1,
+ };
  int ret;
 
  mutex_lock(&hellcreek->reg_lock);
- ret = __hellcreek_fdb_add(hellcreek, &ptp);
+ ret = __hellcreek_fdb_add(hellcreek, &l2_ptp);
+ if (ret)
+ goto out;
+ ret = __hellcreek_fdb_add(hellcreek, &udp4_ptp);
+ if (ret)
+ goto out;
+ ret = __hellcreek_fdb_add(hellcreek, &udp6_ptp);
+ if (ret)
+ goto out;
+ ret = __hellcreek_fdb_add(hellcreek, &l2_p2p);
+ if (ret)
+ goto out;
+ ret = __hellcreek_fdb_add(hellcreek, &udp4_p2p);
+ if (ret)
+ goto out;
+ ret = __hellcreek_fdb_add(hellcreek, &udp6_p2p);
  if (ret)
  goto out;
- ret = __hellcreek_fdb_add(hellcreek, &p2p);
+ ret = __hellcreek_fdb_add(hellcreek, &stp);
 out:
  mutex_unlock(&hellcreek->reg_lock);
 

drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c

@@ -52,10 +52,6 @@ static int hellcreek_set_hwtstamp_config(struct hellcreek *hellcreek, int port,
  */
  clear_bit_unlock(HELLCREEK_HWTSTAMP_ENABLED, &ps->state);
 
- /* Reserved for future extensions */
- if (config->flags)
- return -EINVAL;
-
  switch (config->tx_type) {
  case HWTSTAMP_TX_ON:
  tx_tstamp_enable = true;

drivers/net/dsa/mv88e6xxx/hwtstamp.c

@@ -100,10 +100,6 @@ static int mv88e6xxx_set_hwtstamp_config(struct mv88e6xxx_chip *chip, int port,
  */
  clear_bit_unlock(MV88E6XXX_HWTSTAMP_ENABLED, &ps->state);
 
- /* reserved for future extensions */
- if (config->flags)
- return -EINVAL;
-
  switch (config->tx_type) {
  case HWTSTAMP_TX_OFF:
  tstamp_enable = false;

drivers/net/dsa/sja1105/sja1105_main.c

@@ -2708,17 +2708,17 @@ static void sja1105_port_deferred_xmit(struct kthread_work *work)
 static int sja1105_connect_tag_protocol(struct dsa_switch *ds,
  enum dsa_tag_protocol proto)
 {
+ struct sja1105_private *priv = ds->priv;
  struct sja1105_tagger_data *tagger_data;
 
- switch (proto) {
- case DSA_TAG_PROTO_SJA1105:
- tagger_data = sja1105_tagger_data(ds);
- tagger_data->xmit_work_fn = sja1105_port_deferred_xmit;
- tagger_data->meta_tstamp_handler = sja1110_process_meta_tstamp;
- return 0;
- default:
+ if (proto != priv->info->tag_proto)
  return -EPROTONOSUPPORT;
- }
+
+ tagger_data = sja1105_tagger_data(ds);
+ tagger_data->xmit_work_fn = sja1105_port_deferred_xmit;
+ tagger_data->meta_tstamp_handler = sja1110_process_meta_tstamp;
+
+ return 0;
 }
 
 /* The MAXAGE setting belongs to the L2 Forwarding Parameters table,

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

@@ -1508,9 +1508,6 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
  if (copy_from_user(&config, ifreq->ifr_data, sizeof(config)))
  return -EFAULT;
 
- if (config.flags)
- return -EINVAL;
-
  mac_tscr = 0;
 
  switch (config.tx_type) {

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

@@ -231,9 +231,6 @@ static void aq_ndev_set_multicast_settings(struct net_device *ndev)
 static int aq_ndev_config_hwtstamp(struct aq_nic_s *aq_nic,
  struct hwtstamp_config *config)
 {
- if (config->flags)
- return -EINVAL;
-
  switch (config->tx_type) {
  case HWTSTAMP_TX_OFF:
  case HWTSTAMP_TX_ON:

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

@@ -15356,11 +15356,6 @@ static int bnx2x_hwtstamp_ioctl(struct bnx2x *bp, struct ifreq *ifr)
  DP(BNX2X_MSG_PTP, "Requested tx_type: %d, requested rx_filters = %d\n",
  config.tx_type, config.rx_filter);
 
- if (config.flags) {
- BNX2X_ERR("config.flags is reserved for future use\n");
- return -EINVAL;
- }
-
  bp->hwtstamp_ioctl_called = true;
  bp->tx_type = config.tx_type;
  bp->rx_filter = config.rx_filter;

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c

@@ -417,9 +417,6 @@ int bnxt_hwtstamp_set(struct net_device *dev, struct ifreq *ifr)
  if (copy_from_user(&stmpconf, ifr->ifr_data, sizeof(stmpconf)))
  return -EFAULT;
 
- if (stmpconf.flags)
- return -EINVAL;
-
  if (stmpconf.tx_type != HWTSTAMP_TX_ON &&
  stmpconf.tx_type != HWTSTAMP_TX_OFF)
  return -ERANGE;

drivers/net/ethernet/broadcom/tg3.c

@@ -13806,9 +13806,6 @@ static int tg3_hwtstamp_set(struct net_device *dev, struct ifreq *ifr)
  if (copy_from_user(&stmpconf, ifr->ifr_data, sizeof(stmpconf)))
  return -EFAULT;
 
- if (stmpconf.flags)
- return -EINVAL;
-
  if (stmpconf.tx_type != HWTSTAMP_TX_ON &&
  stmpconf.tx_type != HWTSTAMP_TX_OFF)
  return -ERANGE;

drivers/net/ethernet/cadence/macb_ptp.c

@@ -464,10 +464,6 @@ int gem_set_hwtst(struct net_device *dev, struct ifreq *ifr, int cmd)
  sizeof(*tstamp_config)))
  return -EFAULT;
 
- /* reserved for future extensions */
- if (tstamp_config->flags)
- return -EINVAL;
-
  switch (tstamp_config->tx_type) {
  case HWTSTAMP_TX_OFF:
  break;

drivers/net/ethernet/cavium/liquidio/lio_main.c

@@ -2114,9 +2114,6 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)
  if (copy_from_user(&conf, ifr->ifr_data, sizeof(conf)))
  return -EFAULT;
 
- if (conf.flags)
- return -EINVAL;
-
  switch (conf.tx_type) {
  case HWTSTAMP_TX_ON:
  case HWTSTAMP_TX_OFF:

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

@@ -1254,9 +1254,6 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)
  if (copy_from_user(&conf, ifr->ifr_data, sizeof(conf)))
  return -EFAULT;
 
- if (conf.flags)
- return -EINVAL;
-
  switch (conf.tx_type) {
  case HWTSTAMP_TX_ON:
  case HWTSTAMP_TX_OFF:

drivers/net/ethernet/cavium/octeon/octeon_mgmt.c

@@ -702,9 +702,6 @@ static int octeon_mgmt_ioctl_hwtstamp(struct net_device *netdev,
  if (copy_from_user(&config, rq->ifr_data, sizeof(config)))
  return -EFAULT;
 
- if (config.flags) /* reserved for future extensions */
- return -EINVAL;
-
  /* Check the status of hardware for tiemstamps */
  if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
  /* Get the current state of the PTP clock */

drivers/net/ethernet/cavium/thunder/nicvf_main.c

@@ -1917,10 +1917,6 @@ static int nicvf_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr)
  if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
  return -EFAULT;
 
- /* reserved for future extensions */
- if (config.flags)
- return -EINVAL;
-
  switch (config.tx_type) {
  case HWTSTAMP_TX_OFF:
  case HWTSTAMP_TX_ON:

drivers/net/ethernet/engleder/tsnep_ptp.c

@@ -31,9 +31,6 @@ int tsnep_ptp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
  if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
  return -EFAULT;
 
- if (config.flags)
- return -EINVAL;
-
  switch (config.tx_type) {
  case HWTSTAMP_TX_OFF:
  case HWTSTAMP_TX_ON:

drivers/net/ethernet/freescale/fec_ptp.c

@@ -473,10 +473,6 @@ int fec_ptp_set(struct net_device *ndev, struct ifreq *ifr)
  if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
  return -EFAULT;
 
- /* reserved for future extensions */
- if (config.flags)
- return -EINVAL;
-
  switch (config.tx_type) {
  case HWTSTAMP_TX_OFF:
  fep->hwts_tx_en = 0;