Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0eb3aa9bab20217fb42244ccdcb5bf8a002f504c

Authored by Alexander Duyck
Committed by David S. Miller
1 parent 33dbabc4a7
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

DCB: Add interface to query the state of PFC feature. 

Adds a netlink interface for Data Center Bridging (DCB) to get and set
the enable state of the Priority Flow Control (PFC) feature.
Primarily, this is a way to turn off PFC in the driver while DCB
remains enabled.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 4 changed files with 62 additions and 1 deletions Side-by-side Diff

drivers/net/ixgbe/ixgbe_dcb_nl.c
Diff comments   View file @ 0eb3aa9
... ... @@ -405,6 +405,18 @@
405 405 return -EINVAL;
406 406 }
407 407  
  408 +static u8 ixgbe_dcbnl_getpfcstate(struct net_device *netdev)
  409 +{
  410 + struct ixgbe_adapter *adapter = netdev_priv(netdev);
  411 +
  412 + return !!(adapter->flags & IXGBE_FLAG_DCB_ENABLED);
  413 +}
  414 +
  415 +static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
  416 +{
  417 + return;
  418 +}
  419 +
408 420 struct dcbnl_rtnl_ops dcbnl_ops = {
409 421 .getstate = ixgbe_dcbnl_get_state,
410 422 .setstate = ixgbe_dcbnl_set_state,
... ... @@ -422,6 +434,8 @@
422 434 .setall = ixgbe_dcbnl_set_all,
423 435 .getcap = ixgbe_dcbnl_getcap,
424 436 .getnumtcs = ixgbe_dcbnl_getnumtcs,
425   - .setnumtcs = ixgbe_dcbnl_setnumtcs
  437 + .setnumtcs = ixgbe_dcbnl_setnumtcs,
  438 + .getpfcstate = ixgbe_dcbnl_getpfcstate,
  439 + .setpfcstate = ixgbe_dcbnl_setpfcstate
426 440 };
include/linux/dcbnl.h
Diff comments   View file @ 0eb3aa9
... ... @@ -66,6 +66,8 @@
66 66 DCB_CMD_GCAP,
67 67 DCB_CMD_GNUMTCS,
68 68 DCB_CMD_SNUMTCS,
  69 + DCB_CMD_PFC_GSTATE,
  70 + DCB_CMD_PFC_SSTATE,
69 71  
70 72 __DCB_CMD_ENUM_MAX,
71 73 DCB_CMD_MAX = __DCB_CMD_ENUM_MAX - 1,
... ... @@ -42,6 +42,8 @@
42 42 u8 (*getcap)(struct net_device *, int, u8 *);
43 43 u8 (*getnumtcs)(struct net_device *, int, u8 *);
44 44 u8 (*setnumtcs)(struct net_device *, int, u8);
  45 + u8 (*getpfcstate)(struct net_device *);
  46 + void (*setpfcstate)(struct net_device *, u8);
45 47 };
46 48  
47 49 #endif /* __NET_DCBNL_H__ */
... ... @@ -62,6 +62,7 @@
62 62 [DCB_ATTR_SET_ALL] = {.type = NLA_U8},
63 63 [DCB_ATTR_PERM_HWADDR] = {.type = NLA_FLAG},
64 64 [DCB_ATTR_CAP] = {.type = NLA_NESTED},
  65 + [DCB_ATTR_PFC_STATE] = {.type = NLA_U8},
65 66 };
66 67  
67 68 /* DCB priority flow control to User Priority nested attributes */
... ... @@ -471,6 +472,40 @@
471 472 return ret;
472 473 }
473 474  
  475 +static int dcbnl_getpfcstate(struct net_device *netdev, struct nlattr **tb,
  476 + u32 pid, u32 seq, u16 flags)
  477 +{
  478 + int ret = -EINVAL;
  479 +
  480 + if (!netdev->dcbnl_ops->getpfcstate)
  481 + return ret;
  482 +
  483 + ret = dcbnl_reply(netdev->dcbnl_ops->getpfcstate(netdev), RTM_GETDCB,
  484 + DCB_CMD_PFC_GSTATE, DCB_ATTR_PFC_STATE,
  485 + pid, seq, flags);
  486 +
  487 + return ret;
  488 +}
  489 +
  490 +static int dcbnl_setpfcstate(struct net_device *netdev, struct nlattr **tb,
  491 + u32 pid, u32 seq, u16 flags)
  492 +{
  493 + int ret = -EINVAL;
  494 + u8 value;
  495 +
  496 + if (!tb[DCB_ATTR_PFC_STATE] || !netdev->dcbnl_ops->setpfcstate)
  497 + return ret;
  498 +
  499 + value = nla_get_u8(tb[DCB_ATTR_PFC_STATE]);
  500 +
  501 + netdev->dcbnl_ops->setpfcstate(netdev, value);
  502 +
  503 + ret = dcbnl_reply(0, RTM_SETDCB, DCB_CMD_PFC_SSTATE, DCB_ATTR_PFC_STATE,
  504 + pid, seq, flags);
  505 +
  506 + return ret;
  507 +}
  508 +
474 509 static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlattr **tb,
475 510 u32 pid, u32 seq, u16 flags, int dir)
476 511 {
... ... @@ -888,6 +923,14 @@
888 923 case DCB_CMD_SNUMTCS:
889 924 ret = dcbnl_setnumtcs(netdev, tb, pid, nlh->nlmsg_seq,
890 925 nlh->nlmsg_flags);
  926 + goto out;
  927 + case DCB_CMD_PFC_GSTATE:
  928 + ret = dcbnl_getpfcstate(netdev, tb, pid, nlh->nlmsg_seq,
  929 + nlh->nlmsg_flags);
  930 + goto out;
  931 + case DCB_CMD_PFC_SSTATE:
  932 + ret = dcbnl_setpfcstate(netdev, tb, pid, nlh->nlmsg_seq,
  933 + nlh->nlmsg_flags);
891 934 goto out;
892 935 default:
893 936 goto errout;