ibmvnic: Add vnic client data to login buffer

Update the login buffer to include client data for the vnic driver,
this includes the OS name, LPAR name, and device name. This update
allows this information to be available in the VIOS.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index d0cff2807d0b859822edbb1b42124f69d47df11b..b918bc2f2e4fa059d84b3c276d9b7a62c41d4f15 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -75,6 +75,7 @@
 #include <asm/firmware.h>
 #include <linux/workqueue.h>
 #include <linux/if_vlan.h>
+#include <linux/utsname.h>
 
 #include "ibmvnic.h"
 
@@ -2813,6 +2814,55 @@ static int send_version_xchg(struct ibmvnic_adapter *adapter)
        return ibmvnic_send_crq(adapter, &crq);
 }
 
+struct vnic_login_client_data {
+       u8      type;
+       __be16  len;
+       char    name;
+} __packed;
+
+static int vnic_client_data_len(struct ibmvnic_adapter *adapter)
+{
+       int len;
+
+       /* Calculate the amount of buffer space needed for the
+        * vnic client data in the login buffer. There are four entries,
+        * OS name, LPAR name, device name, and a null last entry.
+        */
+       len = 4 * sizeof(struct vnic_login_client_data);
+       len += 6; /* "Linux" plus NULL */
+       len += strlen(utsname()->nodename) + 1;
+       len += strlen(adapter->netdev->name) + 1;
+
+       return len;
+}
+
+static void vnic_add_client_data(struct ibmvnic_adapter *adapter,
+                                struct vnic_login_client_data *vlcd)
+{
+       const char *os_name = "Linux";
+       int len;
+
+       /* Type 1 - LPAR OS */
+       vlcd->type = 1;
+       len = strlen(os_name) + 1;
+       vlcd->len = cpu_to_be16(len);
+       strncpy(&vlcd->name, os_name, len);
+       vlcd = (struct vnic_login_client_data *)((char *)&vlcd->name + len);
+
+       /* Type 2 - LPAR name */
+       vlcd->type = 2;
+       len = strlen(utsname()->nodename) + 1;
+       vlcd->len = cpu_to_be16(len);
+       strncpy(&vlcd->name, utsname()->nodename, len);
+       vlcd = (struct vnic_login_client_data *)((char *)&vlcd->name + len);
+
+       /* Type 3 - device name */
+       vlcd->type = 3;
+       len = strlen(adapter->netdev->name) + 1;
+       vlcd->len = cpu_to_be16(len);
+       strncpy(&vlcd->name, adapter->netdev->name, len);
+}
+
 static void send_login(struct ibmvnic_adapter *adapter)
 {
        struct ibmvnic_login_rsp_buffer *login_rsp_buffer;
@@ -2825,13 +2875,18 @@ static void send_login(struct ibmvnic_adapter *adapter)
        size_t buffer_size;
        __be64 *tx_list_p;
        __be64 *rx_list_p;
+       int client_data_len;
+       struct vnic_login_client_data *vlcd;
        int i;
 
+       client_data_len = vnic_client_data_len(adapter);
+
        buffer_size =
            sizeof(struct ibmvnic_login_buffer) +
-           sizeof(u64) * (adapter->req_tx_queues + adapter->req_rx_queues);
+           sizeof(u64) * (adapter->req_tx_queues + adapter->req_rx_queues) +
+           client_data_len;
 
-       login_buffer = kmalloc(buffer_size, GFP_ATOMIC);
+       login_buffer = kzalloc(buffer_size, GFP_ATOMIC);
        if (!login_buffer)
                goto buf_alloc_failed;
 
@@ -2898,6 +2953,15 @@ static void send_login(struct ibmvnic_adapter *adapter)
                }
        }
 
+       /* Insert vNIC login client data */
+       vlcd = (struct vnic_login_client_data *)
+               ((char *)rx_list_p + (sizeof(u64) * adapter->req_rx_queues));
+       login_buffer->client_data_offset =
+                       cpu_to_be32((char *)vlcd - (char *)login_buffer);
+       login_buffer->client_data_len = cpu_to_be32(client_data_len);
+
+       vnic_add_client_data(adapter, vlcd);
+
        netdev_dbg(adapter->netdev, "Login Buffer:\n");
        for (i = 0; i < (adapter->login_buf_sz - 1) / 8 + 1; i++) {
                netdev_dbg(adapter->netdev, "%016lx\n",

diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index 4670af80d61271938a5bcb7b9f88d33cc729f877..8ed829c5b026c15031a72e56510432a488f69995 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -57,6 +57,8 @@ struct ibmvnic_login_buffer {
        __be32 off_rxcomp_subcrqs;
        __be32 login_rsp_ioba;
        __be32 login_rsp_len;
+       __be32 client_data_offset;
+       __be32 client_data_len;
 } __packed __aligned(8);
 
 struct ibmvnic_login_rsp_buffer {