Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 231 insertions, 11 deletions

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index e67d16c2e5f3..a6f1e19159d8 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -37,12 +37,15 @@ module_param(gso, bool, 0444);
 #define MAX_PACKET_LEN (ETH_HLEN + VLAN_HLEN + ETH_DATA_LEN)
 #define GOOD_COPY_LEN   128
 
+#define VIRTNET_SEND_COMMAND_SG_MAX    2
+
 struct virtnet_info
 {
         struct virtio_device *vdev;
-        struct virtqueue *rvq, *svq;
+        struct virtqueue *rvq, *svq, *cvq;
         struct net_device *dev;
         struct napi_struct napi;
+        unsigned int status;
 
         /* The skb we couldn't send because buffers were full. */
         struct sk_buff *last_xmit_skb;
@@ -375,9 +378,9 @@ static void skb_recv_done(struct virtqueue *rvq)
 {
         struct virtnet_info *vi = rvq->vdev->priv;
         /* Schedule NAPI, Suppress further interrupts if successful. */
-        if (netif_rx_schedule_prep(&vi->napi)) {
+        if (napi_schedule_prep(&vi->napi)) {
                 rvq->vq_ops->disable_cb(rvq);
-                __netif_rx_schedule(&vi->napi);
+                __napi_schedule(&vi->napi);
         }
 }
 
@@ -403,11 +406,11 @@ again:
 
         /* Out of packets? */
         if (received < budget) {
-                netif_rx_complete(napi);
+                napi_complete(napi);
                 if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq))
                     && napi_schedule_prep(napi)) {
                         vi->rvq->vq_ops->disable_cb(vi->rvq);
-                        __netif_rx_schedule(napi);
+                        __napi_schedule(napi);
                         goto again;
                 }
         }
@@ -562,6 +565,22 @@ stop_queue:
         goto done;
 }
 
+static int virtnet_set_mac_address(struct net_device *dev, void *p)
+{
+        struct virtnet_info *vi = netdev_priv(dev);
+        struct virtio_device *vdev = vi->vdev;
+        int ret;
+
+        ret = eth_mac_addr(dev, p);
+        if (ret)
+                return ret;
+
+        vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),
+                          dev->dev_addr, dev->addr_len);
+
+        return 0;
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void virtnet_netpoll(struct net_device *dev)
 {
@@ -581,13 +600,60 @@ static int virtnet_open(struct net_device *dev)
          * won't get another interrupt, so process any outstanding packets
          * now.  virtnet_poll wants re-enable the queue, so we disable here.
          * We synchronize against interrupts via NAPI_STATE_SCHED */
-        if (netif_rx_schedule_prep(&vi->napi)) {
+        if (napi_schedule_prep(&vi->napi)) {
                 vi->rvq->vq_ops->disable_cb(vi->rvq);
-                __netif_rx_schedule(&vi->napi);
+                __napi_schedule(&vi->napi);
         }
         return 0;
 }
 
+/*
+ * Send command via the control virtqueue and check status.  Commands
+ * supported by the hypervisor, as indicated by feature bits, should
+ * never fail unless improperly formated.
+ */
+static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
+                                 struct scatterlist *data, int out, int in)
+{
+        struct scatterlist sg[VIRTNET_SEND_COMMAND_SG_MAX + 2];
+        struct virtio_net_ctrl_hdr ctrl;
+        virtio_net_ctrl_ack status = ~0;
+        unsigned int tmp;
+
+        if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
+                BUG();  /* Caller should know better */
+                return false;
+        }
+
+        BUG_ON(out + in > VIRTNET_SEND_COMMAND_SG_MAX);
+
+        out++; /* Add header */
+        in++; /* Add return status */
+
+        ctrl.class = class;
+        ctrl.cmd = cmd;
+
+        sg_init_table(sg, out + in);
+
+        sg_set_buf(&sg[0], &ctrl, sizeof(ctrl));
+        memcpy(&sg[1], data, sizeof(struct scatterlist) * (out + in - 2));
+        sg_set_buf(&sg[out + in - 1], &status, sizeof(status));
+
+        if (vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) != 0)
+                BUG();
+
+        vi->cvq->vq_ops->kick(vi->cvq);
+
+        /*
+         * Spin for a response, the kick causes an ioport write, trapping
+         * into the hypervisor, so the request should be handled immediately.
+         */
+        while (!vi->cvq->vq_ops->get_buf(vi->cvq, &tmp))
+                cpu_relax();
+
+        return status == VIRTIO_NET_OK;
+}
+
 static int virtnet_close(struct net_device *dev)
 {
         struct virtnet_info *vi = netdev_priv(dev);
@@ -608,6 +674,99 @@ static int virtnet_set_tx_csum(struct net_device *dev, u32 data)
         return ethtool_op_set_tx_hw_csum(dev, data);
 }
 
+static void virtnet_set_rx_mode(struct net_device *dev)
+{
+        struct virtnet_info *vi = netdev_priv(dev);
+        struct scatterlist sg[2];
+        u8 promisc, allmulti;
+        struct virtio_net_ctrl_mac *mac_data;
+        struct dev_addr_list *addr;
+        void *buf;
+        int i;
+
+        /* We can't dynamicaly set ndo_set_rx_mode, so return gracefully */
+        if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX))
+                return;
+
+        promisc = ((dev->flags & IFF_PROMISC) != 0);
+        allmulti = ((dev->flags & IFF_ALLMULTI) != 0);
+
+        sg_set_buf(sg, &promisc, sizeof(promisc));
+
+        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
+                                  VIRTIO_NET_CTRL_RX_PROMISC,
+                                  sg, 1, 0))
+                dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",
+                         promisc ? "en" : "dis");
+
+        sg_set_buf(sg, &allmulti, sizeof(allmulti));
+
+        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,
+                                  VIRTIO_NET_CTRL_RX_ALLMULTI,
+                                  sg, 1, 0))
+                dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n",
+                         allmulti ? "en" : "dis");
+
+        /* MAC filter - use one buffer for both lists */
+        mac_data = buf = kzalloc(((dev->uc_count + dev->mc_count) * ETH_ALEN) +
+                                 (2 * sizeof(mac_data->entries)), GFP_ATOMIC);
+        if (!buf) {
+                dev_warn(&dev->dev, "No memory for MAC address buffer\n");
+                return;
+        }
+
+        /* Store the unicast list and count in the front of the buffer */
+        mac_data->entries = dev->uc_count;
+        addr = dev->uc_list;
+        for (i = 0; i < dev->uc_count; i++, addr = addr->next)
+                memcpy(&mac_data->macs[i][0], addr->da_addr, ETH_ALEN);
+
+        sg_set_buf(&sg[0], mac_data,
+                   sizeof(mac_data->entries) + (dev->uc_count * ETH_ALEN));
+
+        /* multicast list and count fill the end */
+        mac_data = (void *)&mac_data->macs[dev->uc_count][0];
+
+        mac_data->entries = dev->mc_count;
+        addr = dev->mc_list;
+        for (i = 0; i < dev->mc_count; i++, addr = addr->next)
+                memcpy(&mac_data->macs[i][0], addr->da_addr, ETH_ALEN);
+
+        sg_set_buf(&sg[1], mac_data,
+                   sizeof(mac_data->entries) + (dev->mc_count * ETH_ALEN));
+
+        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,
+                                  VIRTIO_NET_CTRL_MAC_TABLE_SET,
+                                  sg, 2, 0))
+                dev_warn(&dev->dev, "Failed to set MAC fitler table.\n");
+
+        kfree(buf);
+}
+
+static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid)
+{
+        struct virtnet_info *vi = netdev_priv(dev);
+        struct scatterlist sg;
+
+        sg_set_buf(&sg, &vid, sizeof(vid));
+
+        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
+                                  VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0))
+                dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid);
+}
+
+static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
+{
+        struct virtnet_info *vi = netdev_priv(dev);
+        struct scatterlist sg;
+
+        sg_set_buf(&sg, &vid, sizeof(vid));
+
+        if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN,
+                                  VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0))
+                dev_warn(&dev->dev, "Failed to kill VLAN ID %d.\n", vid);
+}
+
 static struct ethtool_ops virtnet_ethtool_ops = {
         .set_tx_csum = virtnet_set_tx_csum,
         .set_sg = ethtool_op_set_sg,
@@ -631,13 +790,51 @@ static const struct net_device_ops virtnet_netdev = {
         .ndo_stop            = virtnet_close,
         .ndo_start_xmit      = start_xmit,
         .ndo_validate_addr   = eth_validate_addr,
-        .ndo_set_mac_address = eth_mac_addr,
+        .ndo_set_mac_address = virtnet_set_mac_address,
+        .ndo_set_rx_mode     = virtnet_set_rx_mode,
         .ndo_change_mtu      = virtnet_change_mtu,
+        .ndo_vlan_rx_add_vid = virnet_vlan_rx_add_vid,
+        .ndo_vlan_rx_kill_vid = virnet_vlan_rx_kill_vid,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller = virtnet_netpoll,
 #endif
 };
 
+static void virtnet_update_status(struct virtnet_info *vi)
+{
+        u16 v;
+
+        if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS))
+                return;
+
+        vi->vdev->config->get(vi->vdev,
+                              offsetof(struct virtio_net_config, status),
+                              &v, sizeof(v));
+
+        /* Ignore unknown (future) status bits */
+        v &= VIRTIO_NET_S_LINK_UP;
+
+        if (vi->status == v)
+                return;
+
+        vi->status = v;
+
+        if (vi->status & VIRTIO_NET_S_LINK_UP) {
+                netif_carrier_on(vi->dev);
+                netif_wake_queue(vi->dev);
+        } else {
+                netif_carrier_off(vi->dev);
+                netif_stop_queue(vi->dev);
+        }
+}
+
+static void virtnet_config_changed(struct virtio_device *vdev)
+{
+        struct virtnet_info *vi = vdev->priv;
+
+        virtnet_update_status(vi);
+}
+
 static int virtnet_probe(struct virtio_device *vdev)
 {
         int err;
@@ -679,8 +876,11 @@ static int virtnet_probe(struct virtio_device *vdev)
                 vdev->config->get(vdev,
                                   offsetof(struct virtio_net_config, mac),
                                   dev->dev_addr, dev->addr_len);
-        } else
+        } else {
                 random_ether_addr(dev->dev_addr);
+                vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),
+                                  dev->dev_addr, dev->addr_len);
+        }
 
         /* Set up our device-specific information */
         vi = netdev_priv(dev);
@@ -716,6 +916,17 @@ static int virtnet_probe(struct virtio_device *vdev)
                 goto free_recv;
         }
 
+        if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
+                vi->cvq = vdev->config->find_vq(vdev, 2, NULL);
+                if (IS_ERR(vi->cvq)) {
+                        err = PTR_ERR(vi->svq);
+                        goto free_send;
+                }
+
+                if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
+                        dev->features |= NETIF_F_HW_VLAN_FILTER;
+        }
+
         /* Initialize our empty receive and send queues. */
         skb_queue_head_init(&vi->recv);
         skb_queue_head_init(&vi->send);
@@ -728,7 +939,7 @@ static int virtnet_probe(struct virtio_device *vdev)
         err = register_netdev(dev);
         if (err) {
                 pr_debug("virtio_net: registering device failed\n");
-                goto free_send;
+                goto free_ctrl;
         }
 
         /* Last of all, set up some receive buffers. */
@@ -740,6 +951,8 @@ static int virtnet_probe(struct virtio_device *vdev)
                 goto unregister;
         }
 
+        vi->status = VIRTIO_NET_S_LINK_UP;
+        virtnet_update_status(vi);
         netif_carrier_on(dev);
 
         pr_debug("virtnet: registered device %s\n", dev->name);
@@ -747,6 +960,9 @@ static int virtnet_probe(struct virtio_device *vdev)
 
 unregister:
         unregister_netdev(dev);
+free_ctrl:
+        if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
+                vdev->config->del_vq(vi->cvq);
 free_send:
         vdev->config->del_vq(vi->svq);
 free_recv:
@@ -778,6 +994,8 @@ static void virtnet_remove(struct virtio_device *vdev)
 
         vdev->config->del_vq(vi->svq);
         vdev->config->del_vq(vi->rvq);
+        if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
+                vdev->config->del_vq(vi->cvq);
         unregister_netdev(vi->dev);
 
         while (vi->pages)
@@ -797,7 +1015,8 @@ static unsigned int features[] = {
         VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6,
         VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6,
         VIRTIO_NET_F_GUEST_ECN, /* We don't yet handle UFO input. */
-        VIRTIO_NET_F_MRG_RXBUF,
+        VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ,
+        VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN,
         VIRTIO_F_NOTIFY_ON_EMPTY,
 };
 
@@ -809,6 +1028,7 @@ static struct virtio_driver virtio_net = {
         .id_table =     id_table,
         .probe =        virtnet_probe,
         .remove =       __devexit_p(virtnet_remove),
+        .config_changed = virtnet_config_changed,
 };
 
 static int __init init(void)