devlink: Introduce PCI SF port flavour and attribute

Introduce PCI SF port flavour and port attributes such as PF
number and SF number.

$ devlink dev eswitch set pci/0000:06:00.0 mode switchdev

$ devlink port show
pci/0000:06:00.0/65535: type eth netdev ens2f0np0 flavour physical port 0 splittable false

$ devlink port add pci/0000:06:00.0 flavour pcisf pfnum 0 sfnum 88
pci/0000:08:00.0/32768: type eth netdev eth6 flavour pcisf controller 0 pfnum 0 sfnum 88 splittable false
  function:
    hw_addr 00:00:00:00:00:00 state inactive opstate detached

$ devlink port show pci/0000:06:00.0/32768
pci/0000:06:00.0/32768: type eth netdev ens2f0npf0sf88 flavour pcisf controller 0 pfnum 0 sfnum 88 splittable false
  function:
    hw_addr 00:00:00:00:00:00 state inactive opstate detached

$ devlink port function set pci/0000:06:00.0/32768 hw_addr 00:00:00:00:88:88 state active

$ devlink port show pci/0000:06:00.0/32768 -jp
{
    "port": {
        "pci/0000:06:00.0/32768": {
            "type": "eth",
            "netdev": "ens2f0npf0sf88",
            "flavour": "pcisf",
            "controller": 0,
            "pfnum": 0,
            "sfnum": 88,
            "splittable": false,
            "function": {
                "hw_addr": "00:00:00:00:88:88",
                "state": "active",
                "opstate": "attached"
            }
        }
    }
}

Signed-off-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/devlink/devlink.c b/devlink/devlink.c
index d21a7c4d35e0260eaaef95937cfaca3cb7735e26..338cb03532527f1434d22279a71d1e7546e9045c 100644 (file)
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -1389,6 +1389,7 @@ static struct str_num_map port_flavour_map[] = {
        { .str = "dsa", .num = DEVLINK_PORT_FLAVOUR_DSA },
        { .str = "pcipf", .num = DEVLINK_PORT_FLAVOUR_PCI_PF },
        { .str = "pcivf", .num = DEVLINK_PORT_FLAVOUR_PCI_VF },
+       { .str = "pcisf", .num = DEVLINK_PORT_FLAVOUR_PCI_SF },
        { .str = "virtual", .num = DEVLINK_PORT_FLAVOUR_VIRTUAL},
        { .str = NULL, },
 };
@@ -3733,7 +3734,7 @@ static const char *port_flavour_name(uint16_t flavour)
        return str ? str : "<unknown flavour>";
 }
 
-static void pr_out_port_pfvf_num(struct dl *dl, struct nlattr **tb)
+static void pr_out_port_pfvfsf_num(struct dl *dl, struct nlattr **tb)
 {
        uint16_t fn_num;
 
@@ -3748,6 +3749,10 @@ static void pr_out_port_pfvf_num(struct dl *dl, struct nlattr **tb)
                fn_num = mnl_attr_get_u16(tb[DEVLINK_ATTR_PORT_PCI_VF_NUMBER]);
                print_uint(PRINT_ANY, "vfnum", " vfnum %u", fn_num);
        }
+       if (tb[DEVLINK_ATTR_PORT_PCI_SF_NUMBER]) {
+               fn_num = mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_PCI_SF_NUMBER]);
+               print_uint(PRINT_ANY, "sfnum", " sfnum %u", fn_num);
+       }
        if (tb[DEVLINK_ATTR_PORT_EXTERNAL]) {
                uint8_t external;
 
@@ -3825,7 +3830,8 @@ static void pr_out_port(struct dl *dl, struct nlattr **tb)
                switch (port_flavour) {
                case DEVLINK_PORT_FLAVOUR_PCI_PF:
                case DEVLINK_PORT_FLAVOUR_PCI_VF:
-                       pr_out_port_pfvf_num(dl, tb);
+               case DEVLINK_PORT_FLAVOUR_PCI_SF:
+                       pr_out_port_pfvfsf_num(dl, tb);
                        break;
                default:
                        break;