Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

31 files changed, 243 insertions, 58 deletions

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 71a7d07c28c9..312c4b4dc363 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -94,7 +94,7 @@ static struct acpi_device *to_acpi_dev(struct acpi_nfit_desc *acpi_desc)
         return to_acpi_device(acpi_desc->dev);
 }
 
-static int xlat_status(void *buf, unsigned int cmd, u32 status)
+static int xlat_bus_status(void *buf, unsigned int cmd, u32 status)
 {
         struct nd_cmd_clear_error *clear_err;
         struct nd_cmd_ars_status *ars_status;
@@ -113,7 +113,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                 flags = ND_ARS_PERSISTENT | ND_ARS_VOLATILE;
                 if ((status >> 16 & flags) == 0)
                         return -ENOTTY;
-                break;
+                return 0;
         case ND_CMD_ARS_START:
                 /* ARS is in progress */
                 if ((status & 0xffff) == NFIT_ARS_START_BUSY)
@@ -122,7 +122,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                 /* Command failed */
                 if (status & 0xffff)
                         return -EIO;
-                break;
+                return 0;
         case ND_CMD_ARS_STATUS:
                 ars_status = buf;
                 /* Command failed */
@@ -146,7 +146,8 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                  * then just continue with the returned results.
                  */
                 if (status == NFIT_ARS_STATUS_INTR) {
-                        if (ars_status->flags & NFIT_ARS_F_OVERFLOW)
+                        if (ars_status->out_length >= 40 && (ars_status->flags
+                                                & NFIT_ARS_F_OVERFLOW))
                                 return -ENOSPC;
                         return 0;
                 }
@@ -154,7 +155,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                 /* Unknown status */
                 if (status >> 16)
                         return -EIO;
-                break;
+                return 0;
         case ND_CMD_CLEAR_ERROR:
                 clear_err = buf;
                 if (status & 0xffff)
@@ -163,7 +164,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                         return -EIO;
                 if (clear_err->length > clear_err->cleared)
                         return clear_err->cleared;
-                break;
+                return 0;
         default:
                 break;
         }
@@ -174,9 +175,18 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
         return 0;
 }
 
-static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
-                struct nvdimm *nvdimm, unsigned int cmd, void *buf,
-                unsigned int buf_len, int *cmd_rc)
+static int xlat_status(struct nvdimm *nvdimm, void *buf, unsigned int cmd,
+                u32 status)
+{
+        if (!nvdimm)
+                return xlat_bus_status(buf, cmd, status);
+        if (status)
+                return -EIO;
+        return 0;
+}
+
+int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
+                unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc)
 {
         struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
         union acpi_object in_obj, in_buf, *out_obj;
@@ -298,7 +308,8 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
 
         for (i = 0, offset = 0; i < desc->out_num; i++) {
                 u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i, buf,
-                                (u32 *) out_obj->buffer.pointer);
+                                (u32 *) out_obj->buffer.pointer,
+                                out_obj->buffer.length - offset);
 
                 if (offset + out_size > out_obj->buffer.length) {
                         dev_dbg(dev, "%s:%s output object underflow cmd: %s field: %d\n",
@@ -333,7 +344,8 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
                          */
                         rc = buf_len - offset - in_buf.buffer.length;
                         if (cmd_rc)
-                                *cmd_rc = xlat_status(buf, cmd, fw_status);
+                                *cmd_rc = xlat_status(nvdimm, buf, cmd,
+                                                fw_status);
                 } else {
                         dev_err(dev, "%s:%s underrun cmd: %s buf_len: %d out_len: %d\n",
                                         __func__, dimm_name, cmd_name, buf_len,
@@ -343,7 +355,7 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
         } else {
                 rc = 0;
                 if (cmd_rc)
-                        *cmd_rc = xlat_status(buf, cmd, fw_status);
+                        *cmd_rc = xlat_status(nvdimm, buf, cmd, fw_status);
         }
 
  out:
@@ -351,6 +363,7 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
 
         return rc;
 }
+EXPORT_SYMBOL_GPL(acpi_nfit_ctl);
 
 static const char *spa_type_name(u16 type)
 {
@@ -2001,19 +2014,32 @@ static int ars_get_status(struct acpi_nfit_desc *acpi_desc)
         return cmd_rc;
 }
 
-static int ars_status_process_records(struct nvdimm_bus *nvdimm_bus,
+static int ars_status_process_records(struct acpi_nfit_desc *acpi_desc,
                 struct nd_cmd_ars_status *ars_status)
 {
+        struct nvdimm_bus *nvdimm_bus = acpi_desc->nvdimm_bus;
         int rc;
         u32 i;
 
+        /*
+         * First record starts at 44 byte offset from the start of the
+         * payload.
+         */
+        if (ars_status->out_length < 44)
+                return 0;
         for (i = 0; i < ars_status->num_records; i++) {
+                /* only process full records */
+                if (ars_status->out_length
+                                < 44 + sizeof(struct nd_ars_record) * (i + 1))
+                        break;
                 rc = nvdimm_bus_add_poison(nvdimm_bus,
                                 ars_status->records[i].err_address,
                                 ars_status->records[i].length);
                 if (rc)
                         return rc;
         }
+        if (i < ars_status->num_records)
+                dev_warn(acpi_desc->dev, "detected truncated ars results\n");
 
         return 0;
 }
@@ -2266,8 +2292,7 @@ static int acpi_nfit_query_poison(struct acpi_nfit_desc *acpi_desc,
         if (rc < 0 && rc != -ENOSPC)
                 return rc;
 
-        if (ars_status_process_records(acpi_desc->nvdimm_bus,
-                                acpi_desc->ars_status))
+        if (ars_status_process_records(acpi_desc, acpi_desc->ars_status))
                 return -ENOMEM;
 
         return 0;
diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h
index 14296f5267c8..fc29c2e9832e 100644
--- a/drivers/acpi/nfit/nfit.h
+++ b/drivers/acpi/nfit/nfit.h
@@ -240,5 +240,7 @@ const u8 *to_nfit_uuid(enum nfit_uuids id);
 int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, void *nfit, acpi_size sz);
 void __acpi_nfit_notify(struct device *dev, acpi_handle handle, u32 event);
 void __acpi_nvdimm_notify(struct device *dev, u32 event);
+int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
+                unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc);
 void acpi_nfit_desc_init(struct acpi_nfit_desc *acpi_desc, struct device *dev);
 #endif /* __NFIT_H__ */
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index c4eb4ae9c3aa..8e575fbdf31d 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1159,6 +1159,7 @@ static void ata_scsi_sdev_config(struct scsi_device *sdev)
 {
         sdev->use_10_for_rw = 1;
         sdev->use_10_for_ms = 1;
+        sdev->no_write_same = 1;
 
         /* Schedule policy is determined by ->qc_defer() callback and
          * it needs to see every deferred qc.  Set dev_blocked to 1 to
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index efc48bf89d51..823e938c9a78 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4090,7 +4090,20 @@ static int mv_platform_probe(struct platform_device *pdev)
 
         /* allocate host */
         if (pdev->dev.of_node) {
-                of_property_read_u32(pdev->dev.of_node, "nr-ports", &n_ports);
+                rc = of_property_read_u32(pdev->dev.of_node, "nr-ports",
+                                           &n_ports);
+                if (rc) {
+                        dev_err(&pdev->dev,
+                                "error parsing nr-ports property: %d\n", rc);
+                        return rc;
+                }
+
+                if (n_ports <= 0) {
+                        dev_err(&pdev->dev, "nr-ports must be positive: %d\n",
+                                n_ports);
+                        return -EINVAL;
+                }
+
                 irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
         } else {
                 mv_platform_data = dev_get_platdata(&pdev->dev);
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 5163c8f918cb..5497f7fc44d0 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1413,8 +1413,14 @@ static ssize_t hot_remove_store(struct class *class,
         return ret ? ret : count;
 }
 
+/*
+ * NOTE: hot_add attribute is not the usual read-only sysfs attribute. In a
+ * sense that reading from this file does alter the state of your system -- it
+ * creates a new un-initialized zram device and returns back this device's
+ * device_id (or an error code if it fails to create a new device).
+ */
 static struct class_attribute zram_control_class_attrs[] = {
-        __ATTR_RO(hot_add),
+        __ATTR(hot_add, 0400, hot_add_show, NULL),
         __ATTR_WO(hot_remove),
         __ATTR_NULL,
 };
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 72ff19658985..e483b78c6343 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -558,8 +558,9 @@ static int caam_probe(struct platform_device *pdev)
          * Enable DECO watchdogs and, if this is a PHYS_ADDR_T_64BIT kernel,
          * long pointers in master configuration register
          */
-        clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH |
-                      MCFGR_AWCACHE_BUFF | MCFGR_WDENABLE | MCFGR_LARGE_BURST |
+        clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK | MCFGR_LONG_PTR,
+                      MCFGR_AWCACHE_CACH | MCFGR_AWCACHE_BUFF |
+                      MCFGR_WDENABLE | MCFGR_LARGE_BURST |
                       (sizeof(dma_addr_t) == sizeof(u64) ? MCFGR_LONG_PTR : 0));
 
         /*
diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c
index 9f284682c091..77712b375b84 100644
--- a/drivers/crypto/marvell/hash.c
+++ b/drivers/crypto/marvell/hash.c
@@ -168,12 +168,11 @@ static void mv_cesa_ahash_std_step(struct ahash_request *req)
         mv_cesa_adjust_op(engine, &creq->op_tmpl);
         memcpy_toio(engine->sram, &creq->op_tmpl, sizeof(creq->op_tmpl));
 
-        digsize = crypto_ahash_digestsize(crypto_ahash_reqtfm(req));
-        for (i = 0; i < digsize / 4; i++)
-                writel_relaxed(creq->state[i], engine->regs + CESA_IVDIG(i));
-
-        mv_cesa_adjust_op(engine, &creq->op_tmpl);
-        memcpy_toio(engine->sram, &creq->op_tmpl, sizeof(creq->op_tmpl));
+        if (!sreq->offset) {
+                digsize = crypto_ahash_digestsize(crypto_ahash_reqtfm(req));
+                for (i = 0; i < digsize / 4; i++)
+                        writel_relaxed(creq->state[i], engine->regs + CESA_IVDIG(i));
+        }
 
         if (creq->cache_ptr)
                 memcpy_toio(engine->sram + CESA_SA_DATA_SRAM_OFFSET,
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c
index 3d94ff20fdca..286447a83dab 100644
--- a/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@ -271,7 +271,7 @@ static int check_vma(struct dax_dev *dax_dev, struct vm_area_struct *vma,
                 return -ENXIO;
 
         /* prevent private mappings from being established */
-        if ((vma->vm_flags & VM_SHARED) != VM_SHARED) {
+        if ((vma->vm_flags & VM_MAYSHARE) != VM_MAYSHARE) {
                 dev_info(dev, "%s: %s: fail, attempted private mapping\n",
                                 current->comm, func);
                 return -EINVAL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 496f72b134eb..05c2850c04b0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -2472,6 +2472,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
                                  struct drm_file *file_priv);
 void amdgpu_driver_preclose_kms(struct drm_device *dev,
                                 struct drm_file *file_priv);
+int amdgpu_suspend(struct amdgpu_device *adev);
 int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon);
 int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon);
 u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 3161d77bf299..e41d4baebf86 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1493,7 +1493,7 @@ static int amdgpu_fini(struct amdgpu_device *adev)
         return 0;
 }
 
-static int amdgpu_suspend(struct amdgpu_device *adev)
+int amdgpu_suspend(struct amdgpu_device *adev)
 {
         int i, r;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 02ff0747197c..e0890deccb2f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -479,12 +479,15 @@ amdgpu_pci_remove(struct pci_dev *pdev)
 static void
 amdgpu_pci_shutdown(struct pci_dev *pdev)
 {
+        struct drm_device *dev = pci_get_drvdata(pdev);
+        struct amdgpu_device *adev = dev->dev_private;
+
         /* if we are running in a VM, make sure the device
          * torn down properly on reboot/shutdown.
          * unfortunately we can't detect certain
          * hypervisors so just do this all the time.
          */
-        amdgpu_pci_remove(pdev);
+        amdgpu_suspend(adev);
 }
 
 static int amdgpu_pmops_suspend(struct device *dev)
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index d1f8ab915b15..b90776ef56ec 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -755,8 +755,10 @@ static int __init ser_gigaset_init(void)
         driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                     GIGASET_MODULENAME, GIGASET_DEVNAME,
                                     &ops, THIS_MODULE);
-        if (!driver)
+        if (!driver) {
+                rc = -ENOMEM;
                 goto error;
+        }
 
         rc = tty_register_ldisc(N_GIGASET_M101, &gigaset_ldisc);
         if (rc != 0) {
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index f3141ca56bc3..0b0302af3bd2 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -870,23 +870,25 @@ lbl_free_candev:
 static void peak_usb_disconnect(struct usb_interface *intf)
 {
         struct peak_usb_device *dev;
+        struct peak_usb_device *dev_prev_siblings;
 
         /* unregister as many netdev devices as siblings */
-        for (dev = usb_get_intfdata(intf); dev; dev = dev->prev_siblings) {
+        for (dev = usb_get_intfdata(intf); dev; dev = dev_prev_siblings) {
                 struct net_device *netdev = dev->netdev;
                 char name[IFNAMSIZ];
 
+                dev_prev_siblings = dev->prev_siblings;
                 dev->state &= ~PCAN_USB_STATE_CONNECTED;
                 strncpy(name, netdev->name, IFNAMSIZ);
 
                 unregister_netdev(netdev);
-                free_candev(netdev);
 
                 kfree(dev->cmd_buf);
                 dev->next_siblings = NULL;
                 if (dev->adapter->dev_free)
                         dev->adapter->dev_free(dev);
 
+                free_candev(netdev);
                 dev_info(&intf->dev, "%s removed\n", name);
         }
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 48113c6609db..66c37fac59b2 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -4921,6 +4921,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
          */
         for_each_port(adapter, i) {
                 pi = adap2pinfo(adapter, i);
+                adapter->port[i]->dev_port = pi->lport;
                 netif_set_real_num_tx_queues(adapter->port[i], pi->nqsets);
                 netif_set_real_num_rx_queues(adapter->port[i], pi->nqsets);
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 20dec85da63d..e8139514d32c 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -7851,7 +7851,6 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
                         return ret;
 
                 memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);
-                adap->port[i]->dev_port = j;
                 j++;
         }
         return 0;
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index fa43e06d3a29..0d1a134c8174 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -2960,6 +2960,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
 
                 netdev->netdev_ops = &cxgb4vf_netdev_ops;
                 netdev->ethtool_ops = &cxgb4vf_ethtool_ops;
+                netdev->dev_port = pi->port_id;
 
                 /*
                  * Initialize the hardware/software state for the port.
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 4a81c892fc31..fbece63395a8 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -58,7 +58,7 @@ static struct kobj_type ktype_veth_pool;
 
 static const char ibmveth_driver_name[] = "ibmveth";
 static const char ibmveth_driver_string[] = "IBM Power Virtual Ethernet Driver";
-#define ibmveth_driver_version "1.05"
+#define ibmveth_driver_version "1.06"
 
 MODULE_AUTHOR("Santiago Leon <santil@linux.vnet.ibm.com>");
 MODULE_DESCRIPTION("IBM Power Virtual Ethernet Driver");
@@ -137,6 +137,11 @@ static inline int ibmveth_rxq_frame_offset(struct ibmveth_adapter *adapter)
         return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_OFF_MASK;
 }
 
+static inline int ibmveth_rxq_large_packet(struct ibmveth_adapter *adapter)
+{
+        return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_LRG_PKT;
+}
+
 static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter)
 {
         return be32_to_cpu(adapter->rx_queue.queue_addr[adapter->rx_queue.index].length);
@@ -1174,6 +1179,45 @@ map_failed:
         goto retry_bounce;
 }
 
+static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt)
+{
+        int offset = 0;
+
+        /* only TCP packets will be aggregated */
+        if (skb->protocol == htons(ETH_P_IP)) {
+                struct iphdr *iph = (struct iphdr *)skb->data;
+
+                if (iph->protocol == IPPROTO_TCP) {
+                        offset = iph->ihl * 4;
+                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+                } else {
+                        return;
+                }
+        } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                struct ipv6hdr *iph6 = (struct ipv6hdr *)skb->data;
+
+                if (iph6->nexthdr == IPPROTO_TCP) {
+                        offset = sizeof(struct ipv6hdr);
+                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
+                } else {
+                        return;
+                }
+        } else {
+                return;
+        }
+        /* if mss is not set through Large Packet bit/mss in rx buffer,
+         * expect that the mss will be written to the tcp header checksum.
+         */
+        if (lrg_pkt) {
+                skb_shinfo(skb)->gso_size = mss;
+        } else if (offset) {
+                struct tcphdr *tcph = (struct tcphdr *)(skb->data + offset);
+
+                skb_shinfo(skb)->gso_size = ntohs(tcph->check);
+                tcph->check = 0;
+        }
+}
+
 static int ibmveth_poll(struct napi_struct *napi, int budget)
 {
         struct ibmveth_adapter *adapter =
@@ -1182,6 +1226,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
         int frames_processed = 0;
         unsigned long lpar_rc;
         struct iphdr *iph;
+        u16 mss = 0;
 
 restart_poll:
         while (frames_processed < budget) {
@@ -1199,9 +1244,21 @@ restart_poll:
                         int length = ibmveth_rxq_frame_length(adapter);
                         int offset = ibmveth_rxq_frame_offset(adapter);
                         int csum_good = ibmveth_rxq_csum_good(adapter);
+                        int lrg_pkt = ibmveth_rxq_large_packet(adapter);
 
                         skb = ibmveth_rxq_get_buffer(adapter);
 
+                        /* if the large packet bit is set in the rx queue
+                         * descriptor, the mss will be written by PHYP eight
+                         * bytes from the start of the rx buffer, which is
+                         * skb->data at this stage
+                         */
+                        if (lrg_pkt) {
+                                __be64 *rxmss = (__be64 *)(skb->data + 8);
+
+                                mss = (u16)be64_to_cpu(*rxmss);
+                        }
+
                         new_skb = NULL;
                         if (length < rx_copybreak)
                                 new_skb = netdev_alloc_skb(netdev, length);
@@ -1235,11 +1292,15 @@ restart_poll:
                                         if (iph->check == 0xffff) {
                                                 iph->check = 0;
                                                 iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
-                                                adapter->rx_large_packets++;
                                         }
                                 }
                         }
 
+                        if (length > netdev->mtu + ETH_HLEN) {
+                                ibmveth_rx_mss_helper(skb, mss, lrg_pkt);
+                                adapter->rx_large_packets++;
+                        }
+
                         napi_gro_receive(napi, skb);    /* send it up */
 
                         netdev->stats.rx_packets++;
diff --git a/drivers/net/ethernet/ibm/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h
index 4eade67fe30c..7acda04d034e 100644
--- a/drivers/net/ethernet/ibm/ibmveth.h
+++ b/drivers/net/ethernet/ibm/ibmveth.h
@@ -209,6 +209,7 @@ struct ibmveth_rx_q_entry {
 #define IBMVETH_RXQ_TOGGLE              0x80000000
 #define IBMVETH_RXQ_TOGGLE_SHIFT        31
 #define IBMVETH_RXQ_VALID               0x40000000
+#define IBMVETH_RXQ_LRG_PKT             0x04000000
 #define IBMVETH_RXQ_NO_CSUM             0x02000000
 #define IBMVETH_RXQ_CSUM_GOOD           0x01000000
 #define IBMVETH_RXQ_OFF_MASK            0x0000FFFF
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 9d931373a9b9..faea52da8dae 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -696,6 +696,7 @@ ltq_etop_probe(struct platform_device *pdev)
         priv->pldata = dev_get_platdata(&pdev->dev);
         priv->netdev = dev;
         spin_lock_init(&priv->lock);
+        SET_NETDEV_DEV(dev, &pdev->dev);
 
         for (i = 0; i < MAX_DMA_CHAN; i++) {
                 if (IS_TX(i))
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index aae46884bf93..521cfdb7d11e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -18,8 +18,6 @@ config MLX5_CORE_EN
         default n
         ---help---
           Ethernet support in Mellanox Technologies ConnectX-4 NIC.
-          Ethernet and Infiniband support in ConnectX-4 are currently mutually
-          exclusive.
 
 config MLX5_CORE_EN_DCB
         bool "Data Center Bridging (DCB) Support"
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index be09573c6ced..c48fc0c4abd9 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -438,9 +438,16 @@ static int smsc911x_request_resources(struct platform_device *pdev)
         ret = regulator_bulk_get(&pdev->dev,
                         ARRAY_SIZE(pdata->supplies),
                         pdata->supplies);
-        if (ret)
+        if (ret) {
+                /*
+                 * Retry on deferrals, else just report the error
+                 * and try to continue.
+                 */
+                if (ret == -EPROBE_DEFER)
+                        return ret;
                 netdev_err(ndev, "couldn't get regulators %d\n",
                                 ret);
+        }
 
         /* Request optional RESET GPIO */
         pdata->reset_gpiod = devm_gpiod_get_optional(&pdev->dev,
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index c56e7030c44e..77c88fcf2b86 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1112,6 +1112,7 @@ static int cpmac_probe(struct platform_device *pdev)
         if (!dev)
                 return -ENOMEM;
 
+        SET_NETDEV_DEV(dev, &pdev->dev);
         platform_set_drvdata(pdev, dev);
         priv = netdev_priv(dev);
 
diff --git a/drivers/net/ethernet/ti/cpsw-phy-sel.c b/drivers/net/ethernet/ti/cpsw-phy-sel.c
index ba1e45ff6aae..18013645e76c 100644
--- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
+++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
@@ -81,6 +81,7 @@ static void cpsw_gmii_sel_am3352(struct cpsw_phy_sel_priv *priv,
         };
 
         mask = GMII_SEL_MODE_MASK << (slave * 2) | BIT(slave + 6);
+        mask |= BIT(slave + 4);
         mode <<= slave * 2;
 
         if (priv->rmii_clock_external) {
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 9522763c8faf..c9414c054852 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -47,6 +47,10 @@
                                  NETIF_F_TSO | \
                                  NETIF_F_TSO6 | \
                                  NETIF_F_HW_CSUM)
+
+/* Restrict GSO size to account for NVGRE */
+#define NETVSC_GSO_MAX_SIZE     62768
+
 static int ring_size = 128;
 module_param(ring_size, int, S_IRUGO);
 MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
@@ -1393,6 +1397,7 @@ static int netvsc_probe(struct hv_device *dev,
         nvdev = net_device_ctx->nvdev;
         netif_set_real_num_tx_queues(net, nvdev->num_chn);
         netif_set_real_num_rx_queues(net, nvdev->num_chn);
+        netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);
 
         /* MTU range: 68 - 1500 or 65521 */
         net->min_mtu = NETVSC_MTU_MIN;
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index ffe8994e64fc..693ec5b66222 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -546,13 +546,15 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
         }
         err = ipvlan_set_port_mode(port, mode);
         if (err) {
-                goto unregister_netdev;
+                goto unlink_netdev;
         }
 
         list_add_tail_rcu(&ipvlan->pnode, &port->ipvlans);
         netif_stacked_transfer_operstate(phy_dev, dev);
         return 0;
 
+unlink_netdev:
+        netdev_upper_dev_unlink(phy_dev, dev);
 unregister_netdev:
         unregister_netdevice(dev);
 destroy_ipvlan_port:
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 32fa7c76f29c..0aadef9fc7dd 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -905,11 +905,17 @@ EXPORT_SYMBOL(phy_attached_print);
 int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
                       u32 flags, phy_interface_t interface)
 {
+        struct module *ndev_owner = dev->dev.parent->driver->owner;
         struct mii_bus *bus = phydev->mdio.bus;
         struct device *d = &phydev->mdio.dev;
         int err;
 
-        if (!try_module_get(bus->owner)) {
+        /* For Ethernet device drivers that register their own MDIO bus, we
+         * will have bus->owner match ndev_mod, so we do not want to increment
+         * our own module->refcnt here, otherwise we would not be able to
+         * unload later on.
+         */
+        if (ndev_owner != bus->owner && !try_module_get(bus->owner)) {
                 dev_err(&dev->dev, "failed to get the bus module\n");
                 return -EIO;
         }
@@ -971,7 +977,8 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
 error:
         phy_detach(phydev);
         put_device(d);
-        module_put(bus->owner);
+        if (ndev_owner != bus->owner)
+                module_put(bus->owner);
         return err;
 }
 EXPORT_SYMBOL(phy_attach_direct);
@@ -1021,6 +1028,8 @@ EXPORT_SYMBOL(phy_attach);
  */
 void phy_detach(struct phy_device *phydev)
 {
+        struct net_device *dev = phydev->attached_dev;
+        struct module *ndev_owner = dev->dev.parent->driver->owner;
         struct mii_bus *bus;
         int i;
 
@@ -1050,7 +1059,8 @@ void phy_detach(struct phy_device *phydev)
         bus = phydev->mdio.bus;
 
         put_device(&phydev->mdio.dev);
-        module_put(bus->owner);
+        if (ndev_owner != bus->owner)
+                module_put(bus->owner);
 }
 EXPORT_SYMBOL(phy_detach);
 
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
index 96a5028621c8..3a98f3762a4c 100644
--- a/drivers/net/usb/cdc_mbim.c
+++ b/drivers/net/usb/cdc_mbim.c
@@ -602,6 +602,21 @@ static const struct driver_info cdc_mbim_info_ndp_to_end = {
         .data = CDC_NCM_FLAG_NDP_TO_END,
 };
 
+/* Some modems (e.g. Telit LE922A6) do not work properly with altsetting
+ * toggle done in cdc_ncm_bind_common. CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE
+ * flag is used to avoid this procedure.
+ */
+static const struct driver_info cdc_mbim_info_avoid_altsetting_toggle = {
+        .description = "CDC MBIM",
+        .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
+        .bind = cdc_mbim_bind,
+        .unbind = cdc_mbim_unbind,
+        .manage_power = cdc_mbim_manage_power,
+        .rx_fixup = cdc_mbim_rx_fixup,
+        .tx_fixup = cdc_mbim_tx_fixup,
+        .data = CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE,
+};
+
 static const struct usb_device_id mbim_devs[] = {
         /* This duplicate NCM entry is intentional. MBIM devices can
          * be disguised as NCM by default, and this is necessary to
@@ -626,6 +641,12 @@ static const struct usb_device_id mbim_devs[] = {
         { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
           .driver_info = (unsigned long)&cdc_mbim_info_ndp_to_end,
         },
+
+        /* Telit LE922A6 in MBIM composition */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1bc7, 0x1041, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
+          .driver_info = (unsigned long)&cdc_mbim_info_avoid_altsetting_toggle,
+        },
+
         /* default entry */
         { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
           .driver_info = (unsigned long)&cdc_mbim_info_zlp,
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 7141817946f0..2d1a6f2e16ab 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -835,11 +835,18 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
 
         iface_no = ctx->data->cur_altsetting->desc.bInterfaceNumber;
 
+        /* Device-specific flags */
+        ctx->drvflags = drvflags;
+
         /* Reset data interface. Some devices will not reset properly
          * unless they are configured first.  Toggle the altsetting to
-         * force a reset
+         * force a reset.
+         * Some other devices do not work properly with this procedure
+         * that can be avoided using quirk CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE
          */
-        usb_set_interface(dev->udev, iface_no, data_altsetting);
+        if (!(ctx->drvflags & CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE))
+                usb_set_interface(dev->udev, iface_no, data_altsetting);
+
         temp = usb_set_interface(dev->udev, iface_no, 0);
         if (temp) {
                 dev_dbg(&intf->dev, "set interface failed\n");
@@ -886,9 +893,6 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
         /* finish setting up the device specific data */
         cdc_ncm_setup(dev);
 
-        /* Device-specific flags */
-        ctx->drvflags = drvflags;
-
         /* Allocate the delayed NDP if needed. */
         if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END) {
                 ctx->delayed_ndp16 = kzalloc(ctx->max_ndp_size, GFP_KERNEL);
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index a8b6949a8778..23d4a1728cdf 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -715,7 +715,7 @@ EXPORT_SYMBOL_GPL(nd_cmd_in_size);
 
 u32 nd_cmd_out_size(struct nvdimm *nvdimm, int cmd,
                 const struct nd_cmd_desc *desc, int idx, const u32 *in_field,
-                const u32 *out_field)
+                const u32 *out_field, unsigned long remainder)
 {
         if (idx >= desc->out_num)
                 return UINT_MAX;
@@ -727,9 +727,24 @@ u32 nd_cmd_out_size(struct nvdimm *nvdimm, int cmd,
                 return in_field[1];
         else if (nvdimm && cmd == ND_CMD_VENDOR && idx == 2)
                 return out_field[1];
-        else if (!nvdimm && cmd == ND_CMD_ARS_STATUS && idx == 2)
-                return out_field[1] - 8;
-        else if (cmd == ND_CMD_CALL) {
+        else if (!nvdimm && cmd == ND_CMD_ARS_STATUS && idx == 2) {
+                /*
+                 * Per table 9-276 ARS Data in ACPI 6.1, out_field[1] is
+                 * "Size of Output Buffer in bytes, including this
+                 * field."
+                 */
+                if (out_field[1] < 4)
+                        return 0;
+                /*
+                 * ACPI 6.1 is ambiguous if 'status' is included in the
+                 * output size. If we encounter an output size that
+                 * overshoots the remainder by 4 bytes, assume it was
+                 * including 'status'.
+                 */
+                if (out_field[1] - 8 == remainder)
+                        return remainder;
+                return out_field[1] - 4;
+        } else if (cmd == ND_CMD_CALL) {
                 struct nd_cmd_pkg *pkg = (struct nd_cmd_pkg *) in_field;
 
                 return pkg->nd_size_out;
@@ -876,7 +891,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm,
         /* process an output envelope */
         for (i = 0; i < desc->out_num; i++) {
                 u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i,
-                                (u32 *) in_env, (u32 *) out_env);
+                                (u32 *) in_env, (u32 *) out_env, 0);
                 u32 copy;
 
                 if (out_size == UINT_MAX) {
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index c5326055beee..f4f77c5b0c83 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1323,18 +1323,20 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 {
         lockdep_assert_held(&phba->hbalock);
 
-        BUG_ON(!piocb || !piocb->vport);
+        BUG_ON(!piocb);
 
         list_add_tail(&piocb->list, &pring->txcmplq);
         piocb->iocb_flag |= LPFC_IO_ON_TXCMPLQ;
 
         if ((unlikely(pring->ringno == LPFC_ELS_RING)) &&
            (piocb->iocb.ulpCommand != CMD_ABORT_XRI_CN) &&
-           (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN) &&
-            (!(piocb->vport->load_flag & FC_UNLOADING)))
-                mod_timer(&piocb->vport->els_tmofunc,
-                          jiffies +
-                          msecs_to_jiffies(1000 * (phba->fc_ratov << 1)));
+           (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN)) {
+                BUG_ON(!piocb->vport);
+                if (!(piocb->vport->load_flag & FC_UNLOADING))
+                        mod_timer(&piocb->vport->els_tmofunc,
+                                  jiffies +
+                                  msecs_to_jiffies(1000 * (phba->fc_ratov << 1)));
+        }
 
         return 0;
 }
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 9c3c68b9a49e..e6b70966c19d 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -503,7 +503,7 @@ static void vhost_vsock_reset_orphans(struct sock *sk)
          * executing.
          */
 
-        if (!vhost_vsock_get(vsk->local_addr.svm_cid)) {
+        if (!vhost_vsock_get(vsk->remote_addr.svm_cid)) {
                 sock_set_flag(sk, SOCK_DONE);
                 vsk->peer_shutdown = SHUTDOWN_MASK;
                 sk->sk_state = SS_UNCONNECTED;